Bug 484287 - [OS/2] simplify test_os2.cmd; [email protected]

dothq · Mar 26, 2009 · 2915304 · 2915304
1 parent 5900318
commit 2915304
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/testing/xpcshell/test_os2.cmd → build/os2/test_os2.cmd b/testing/xpcshell/test_os2.cmd → build/os2/test_os2.cmd
@@ -1,17 +1,10 @@
 /* Invoke unit tests on OS/2 */
 PARSE ARG dist prog parm
 dist=forwardtoback(dist);
+prog=forwardtoback(prog);
 'set BEGINLIBPATH='dist'\bin;%BEGINLIBPATH%'
 'set LIBPATHSTRICT=T'
-if substr(FILESPEC("name",prog),1,5) \= 'test_'
-     then
-	do
-           prog=forwardtoback(prog)
-           prog parm
-           exit
-        end
-     else
-   bash prog parm
+prog parm
 exit
 
 forwardtoback: procedure

diff --git a/config/config.mk b/config/config.mk
@@ -863,7 +863,7 @@ RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
 endif
 
 ifeq ($(OS_ARCH),OS2)
-RUN_TEST_PROGRAM = $(topsrcdir)/testing/xpcshell/test_os2.cmd "$(DIST)"
+RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
 endif
 
 #

diff --git a/js/src/config/config.mk b/js/src/config/config.mk
@@ -863,7 +863,7 @@ RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
 endif
 
 ifeq ($(OS_ARCH),OS2)
-RUN_TEST_PROGRAM = $(topsrcdir)/testing/xpcshell/test_os2.cmd "$(DIST)"
+RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
 endif
 
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -863,7 +863,7 @@ RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh @@
     endif
     ifeq ($(OS_ARCH),OS2)
-    RUN_TEST_PROGRAM = $(topsrcdir)/testing/xpcshell/test_os2.cmd "$(DIST)"
+    RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
     endif
     #
@@ Expand Down @@