[jboss-cvs] JBossAS SVN: r112287 - branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment.

[jboss-cvs-commits at lists.jboss.org]

Author: jiwils
Date: 2011-10-04 10:44:25 -0400 (Tue, 04 Oct 2011)
New Revision: 112287

Modified:
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/JBPAPP6716UnitTestCase.java
Log:
Fix for JBPAPP-7330. Twiddle tests were hardcoded to use twiddle.sh so they didn't work on windows.

Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/JBPAPP6716UnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/JBPAPP6716UnitTestCase.java	2011-10-04 14:34:29 UTC (rev 112286)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/JBPAPP6716UnitTestCase.java	2011-10-04 14:44:25 UTC (rev 112287)
@@ -485,7 +485,19 @@
    
    private void twiddle(String args, String searchString)
    {
-      String command = JBOSS_HOME + "/bin/twiddle.sh " + args;      
+      String command = null;
+
+      boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows");
+
+      if (isWindows)
+      {
+         command = JBOSS_HOME + "/bin/twiddle.bat " + args;
+      }
+      else
+      {
+         command = JBOSS_HOME + "/bin/twiddle.sh " + args;
+      }
+
       Process child = null;
       
       // default to true since searchString may not be checked