Move implementation of failed-tests-printer.pl into test.pl

tautschnig · tautschnig · commit 3321735dc7dd · 2017-11-02T12:18:15.000Z
Added a new option "-p" to test.pl to request printing failure logs instead of
doing so via an external script. This simplifies various Makefiles and enables
use in cmake builds.
diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt
@@ -6,7 +6,7 @@ set(test_pl_path "${CMAKE_CURRENT_SOURCE_DIR}/test.pl")
 macro(add_test_pl_profile name cmdline flag profile)
     add_test(
         NAME "${name}-${profile}"
-        COMMAND ${test_pl_path} -c ${cmdline} ${flag}
+        COMMAND ${test_pl_path} -p -c ${cmdline} ${flag}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     )
     set_tests_properties("${name}-${profile}" PROPERTIES
diff --git a/regression/ansi-c/Makefile b/regression/ansi-c/Makefile
@@ -10,16 +10,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 show:
 	@for dir in *; do \
diff --git a/regression/cbmc-cover/Makefile b/regression/cbmc-cover/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/cbmc-java-inheritance/Makefile b/regression/cbmc-java-inheritance/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/cbmc-java/Makefile b/regression/cbmc-java/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/cbmc/Makefile b/regression/cbmc/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/cpp-linter/Makefile b/regression/cpp-linter/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c python ../../../scripts/cpplint.py ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c "python ../../../scripts/cpplint.py"
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c "python ../../../scripts/cpplint.py" ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c "python ../../../scripts/cpplint.py"
 
 show:
 	@for dir in *; do \
diff --git a/regression/cpp/Makefile b/regression/cpp/Makefile
@@ -10,16 +10,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 show:
 	@for dir in *; do \
diff --git a/regression/failed-tests-printer.pl b/regression/failed-tests-printer.pl
diff --git a/regression/fault-localization/Makefile b/regression/fault-localization/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-analyzer-taint/Makefile b/regression/goto-analyzer-taint/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-analyzer/Makefile b/regression/goto-analyzer/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-cc-cbmc/Makefile b/regression/goto-cc-cbmc/Makefile
@@ -12,16 +12,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/cbmc/cbmc $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/cbmc/cbmc $(is_windows)'
 
 tests.log:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/cbmc/cbmc $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/cbmc/cbmc $(is_windows)'
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-cc-goto-analyzer/Makefile b/regression/goto-cc-goto-analyzer/Makefile
@@ -12,17 +12,11 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-analyzer/goto-analyzer $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-analyzer/goto-analyzer $(is_windows)'
 
 tests.log:
 	pwd
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-analyzer/goto-analyzer $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-analyzer/goto-analyzer $(is_windows)'
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-diff/Makefile b/regression/goto-diff/Makefile
@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/goto-diff/goto-diff ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-diff/goto-diff
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/goto-diff/goto-diff ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-diff/goto-diff
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-gcc/Makefile b/regression/goto-gcc/Makefile
@@ -2,17 +2,11 @@ default: tests.log
 
 test:
 	-@ln -s goto-cc ../../src/goto-cc/goto-gcc
-	@if ! ../test.pl -c ../../../src/goto-cc/goto-gcc ; then \
-	  ../failed-tests-printer.pl ; \
-	  exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-cc/goto-gcc
 
 tests.log: ../test.pl
 	-@ln -s goto-cc ../../src/goto-cc/goto-gcc
-	@if ! ../test.pl -c ../../../src/goto-cc/goto-gcc ; then \
-	  ../failed-tests-printer.pl ; \
-	  exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/goto-cc/goto-gcc
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-instrument-typedef/Makefile b/regression/goto-instrument-typedef/Makefile
@@ -12,16 +12,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument $(is_windows)'
 
 tests.log:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument $(is_windows)'
 
 show:
 	@for dir in *; do \
diff --git a/regression/goto-instrument/Makefile b/regression/goto-instrument/Makefile
@@ -12,16 +12,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
 
 tests.log:
-	@if ! ../test.pl -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)' ; then \
-		../failed-tests-printer.pl ; \
-		exit 1; \
-	fi
+	@../test.pl -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
 
 show:
 	@for dir in *; do \
diff --git a/regression/invariants/Makefile b/regression/invariants/Makefile
@@ -11,16 +11,10 @@ include ../../src/config.inc
 include ../../src/common
 
 test: driver$(EXEEXT)
-	@if ! ../test.pl -c ../driver ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../driver
 
 tests.log: ../test.pl driver$(EXEEXT)
-	@if ! ../test.pl -c ../driver ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../driver
 
 show:
 	@for dir in *; do \
diff --git a/regression/strings-smoke-tests/Makefile b/regression/strings-smoke-tests/Makefile
@@ -1,28 +1,16 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 testfuture:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc -CF ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc -CF
 
 testall:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc -CFTK ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc -CFTK
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 show:
 	@for dir in *; do \
diff --git a/regression/strings/Makefile b/regression/strings/Makefile
diff --git a/regression/test-script/Makefile b/regression/test-script/Makefile
diff --git a/regression/test.pl b/regression/test.pl

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ set(test_pl_path "${CMAKE_CURRENT_SOURCE_DIR}/test.pl")`
`6`	`6`	`macro(add_test_pl_profile name cmdline flag profile)`
`7`	`7`	`add_test(`
`8`	`8`	`NAME "${name}-${profile}"`
`9`		`- COMMAND ${test_pl_path} -c ${cmdline} ${flag}`
	`9`	`+ COMMAND ${test_pl_path} -p -c ${cmdline} ${flag}`
`10`	`10`	`WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"`
`11`	`11`	`)`
`12`	`12`	`set_tests_properties("${name}-${profile}" PROPERTIES`