From 0c75b472884d0ec8286b713f570a486e562d1118 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 22 Jun 2018 18:18:59 +0100 Subject: [PATCH 1/2] Run strings-smoke-tests and janalyzer tests There were typos in the test directory names, --- jbmc/regression/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jbmc/regression/Makefile b/jbmc/regression/Makefile index 0d85532780a..19e5d240cc1 100644 --- a/jbmc/regression/Makefile +++ b/jbmc/regression/Makefile @@ -1,14 +1,14 @@ # For the best possible utilisation of multiple cores when # running tests in parallel, it is important that these directories are # listed with decreasing runtimes (i.e. longest running at the top) -DIRS = janalzyer-taint \ +DIRS = janalyzer-taint \ jbmc \ jbmc-concurrency \ jbmc-cover \ jbmc-inheritance \ jbmc-strings \ jdiff \ - string-smoke-tests \ + strings-smoke-tests \ jbmc-generics \ # Empty last line From f1afbff02b1cd97fa11d42ac68676bdd8c866015 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Sat, 7 Jul 2018 17:21:47 +0100 Subject: [PATCH 2/2] Remove unnecessary PLATFORM_DIRS --- jbmc/regression/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/jbmc/regression/Makefile b/jbmc/regression/Makefile index 19e5d240cc1..17b0e94bb01 100644 --- a/jbmc/regression/Makefile +++ b/jbmc/regression/Makefile @@ -12,21 +12,16 @@ DIRS = janalyzer-taint \ jbmc-generics \ # Empty last line -# Tests under goto-gcc cannot be run on Windows, so appveyor.yml unlinks -# the entire directory under Windows. This variable will contain the list -# of directories that actually exist on the current platform. -PLATFORM_DIRS = $(wildcard $(DIRS)) - # Run all test directories in sequence .PHONY: test test: - @for dir in $(PLATFORM_DIRS); do \ + @for dir in $(DIRS); do \ $(MAKE) "$$dir" || exit 1; \ done; # Pattern to execute a single test suite directory -.PHONY: $(PLATFORM_DIRS) -$(PLATFORM_DIRS): +.PHONY: $(DIRS) +$(DIRS): @echo "Running $@..." ; $(MAKE) -C "$@" test || exit 1; @@ -42,7 +37,7 @@ test-parallel: --linebuffer \ --jobs $(JOBS) \ $(MAKE) "{}" \ - ::: $(PLATFORM_DIRS) + ::: $(DIRS) .PHONY: clean