Fixed parallel_make test to test only serialized targets

darcs-hash:20080418181614-f2ef6-6a9681d617a9825c81c55f2b0b4c6a6a9dac02cd.gz

diff --git a/tests/parallel_make/dir1/Makefile.omk b/tests/parallel_make/dir1/Makefile.omk
index 5076c89855dbc3daa0b54257611483b7f709b1b8..ebefe7ea1604431250364dc7e0f5ee77ea55cc86 100644 (file)
--- a/tests/parallel_make/dir1/Makefile.omk
+++ b/tests/parallel_make/dir1/Makefile.omk
@@ -1,6 +1 @@
 $(info $(MAKECMDGOALS))
-
-%-pass: %-pass-message
-
-%-pass-message:
-       @echo $@

diff --git a/tests/parallel_make/dir2/Makefile.omk b/tests/parallel_make/dir2/Makefile.omk
index 364cce677ae574f4ac049a014026ff6c280dc5db..ebefe7ea1604431250364dc7e0f5ee77ea55cc86 100644 (file)
--- a/tests/parallel_make/dir2/Makefile.omk
+++ b/tests/parallel_make/dir2/Makefile.omk
@@ -1,6 +1 @@
 $(info $(MAKECMDGOALS))
-
-%-pass-local: %-pass-message
-
-%-pass-message:
-       @echo $@

diff --git a/tests/parallel_make/dir3/Makefile.omk b/tests/parallel_make/dir3/Makefile.omk
index 364cce677ae574f4ac049a014026ff6c280dc5db..ebefe7ea1604431250364dc7e0f5ee77ea55cc86 100644 (file)
--- a/tests/parallel_make/dir3/Makefile.omk
+++ b/tests/parallel_make/dir3/Makefile.omk
@@ -1,6 +1 @@
 $(info $(MAKECMDGOALS))
-
-%-pass-local: %-pass-message
-
-%-pass-message:
-       @echo $@

diff --git a/tests/parallel_make/runtest b/tests/parallel_make/runtest
index 2c8edf45eab1c57c4fc1cfe4fb3742a40bc32e77..839b81ddc36ac88d58c95c050e1a3eb7ba7ca4d7 100755 (executable)
--- a/tests/parallel_make/runtest
+++ b/tests/parallel_make/runtest
@@ -2,7 +2,7 @@
 
 . ../functions.sh
 
-make -j | grep -vE '(^make\[.*\]|-local$)' > passes
+make -j | grep -E '^(include-pass|library-pass|binary-pass)' | tee passes
 
 cat passes|uniq > passes.uniq
 LINES_UNIQ=`cat passes.uniq|wc -l`

diff --git a/tests/tester.py b/tests/tester.py
index 25b04de1d72c1777498b0f9e046f0c6f41b8d921..bd849692eaceabd63e50911a3632ff90fb56398b 100755 (executable)
--- a/tests/tester.py
+++ b/tests/tester.py
@@ -324,11 +324,13 @@ class TestCase:
         log.exitcode = ret
         log.stdout = output
         log.message = ''
-        if ret != 0:
-            if os.path.exists("_canttest"):
-                log.message = file("_canttest").read()
-                log.canttest = 1
-            elif os.path.exists("_error"):
+        if os.path.exists("_canttest"):
+            log.message = file("_canttest").read()
+            log.canttest = 1
+            ret = 2                     # If Makefile sets canttest, override the exit code which might be zero
+            log.exitcode = ret
+        elif ret != 0:
+            if os.path.exists("_error"):
                 log.message = file("_error").read()
         return ret
 
@@ -342,8 +344,8 @@ class TestCase:
         print "    ",os.environ['OMK_RULES'],
         sys.stdout.flush()
         ret = self._exec(log)
-        if ret == 0: retstr = "OK"
-        elif log.canttest: retstr = "--"
+        if log.canttest: retstr = "--"
+        elif ret == 0: retstr = "OK"
         else: retstr = "FAILED"
         print "%*s%s" % (20-len(os.environ['OMK_RULES']), "", retstr)