Author: florian
Date: 2005-09-23 18:50:17 -0400 (Fri, 23 Sep 2005)
New Revision: 50643

Modified:
   trunk/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog
   trunk/mcs/class/Microsoft.JScript/Test/Mozilla/runner.cs
Log:
2005-09-24  Florian Gross  <[EMAIL PROTECTED]>

        * Changed Win32 options in runner.cs to match the reality again


Modified: trunk/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog    2005-09-23 
22:37:55 UTC (rev 50642)
+++ trunk/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog    2005-09-23 
22:50:17 UTC (rev 50643)
@@ -1,3 +1,7 @@
+2005-09-24  Florian Gross  <[EMAIL PROTECTED]>
+
+       * Changed Win32 options in runner.cs to match the reality again
+
 2005-09-08  Cesar Lopez Nataren  <[EMAIL PROTECTED]>
 
        * mjs-most.tests: enable more tests.

Modified: trunk/mcs/class/Microsoft.JScript/Test/Mozilla/runner.cs
===================================================================
--- trunk/mcs/class/Microsoft.JScript/Test/Mozilla/runner.cs    2005-09-23 
22:37:55 UTC (rev 50642)
+++ trunk/mcs/class/Microsoft.JScript/Test/Mozilla/runner.cs    2005-09-23 
22:50:17 UTC (rev 50643)
@@ -69,20 +69,20 @@
                        config.full_run = false;
                        config.test_dir = env ["MJS_TEST_DIR"] as string;
                        if (config.test_dir == null)
-                               config.test_dir = config.is_win32 ? 
"D:/cygwin/opt/mono/bin" : "/tmp";
+                               config.test_dir = config.is_win32 ? env 
["TEMP"] as string : "/tmp";
 
                        config.compile_cmd = env ["MJS_COMPILE_CMD"] as string;
                        if (config.compile_cmd == null)
-                               config.compile_cmd = config.is_win32 ? 
"mono.exe" : "mjs";
+                               config.compile_cmd = config.is_win32 ? "bash" : 
"mjs";
 
                        string compile_str = env ["MJS_COMPILE_ARGS"] as string;
                        if (compile_str == null)
-                               compile_str = config.is_win32 ? "mjs.exe {0}" : 
"{0}";
+                               compile_str = config.is_win32 ? "mjs {0}" : 
"{0}";
                        config.compile_args = String.Format (compile_str, 
"jstest.js");
 
                        config.run_cmd = env ["MJS_RUN_CMD"] as string;
                        if (config.run_cmd == null)
-                               config.run_cmd = config.is_win32 ? "mono.exe" : 
"mono";
+                               config.run_cmd = "mono";
 
                        string run_str = env ["MJS_RUN_ARGS"] as string;
                        if (run_str == null)
@@ -187,6 +187,9 @@
                                Console.WriteLine ();
                                Console.WriteLine ("Running {0}...", test);
 
+                               Console.WriteLine (config.compile_cmd);
+                               Console.WriteLine (config.compile_args);
+
                                ProcessStartInfo compiler_info = new 
ProcessStartInfo (config.compile_cmd, config.compile_args);
                                compiler_info.CreateNoWindow = true;
                                compiler_info.UseShellExecute = false;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to