tests: run cmake twice

might improve #2967
ElektraInitiative · Nov 16, 2019 · ec1adc5 · ec1adc5
1 parent 1eded4f
commit ec1adc5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -304,6 +304,7 @@ you up to date with the multi-language support provided by Elektra.
 - We disabled the test for the conversion engine. For more information, please take a look at [issue #3086](https://issues.libelektra.org/3086). _(René Schwaiger)_
 - We disabled the test `testmod_zeromqsend` from the command `kdb run_all`, since it caused timeouts in high load scenarios. _(Mihael Pranjić)_
 - The (Markdown) [Shell Recorder](../../tests/shell/shell_recorder/README.md) now prints the protocol for a failed test, even if the test modified the database permanently. _(René Schwaiger)_
+- We rerun ctest twice to ignore temporary build failures. _(Markus Raab)_
 
 ## Build
 

diff --git a/scripts/run_all.in b/scripts/run_all.in
@@ -13,4 +13,4 @@ fi
 #
 # also use `run_memcheck` to check for memory issues (tests are complementary)
 
-ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check_external --build-config $1
+ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -E testscr_check_external --build-config $1 || ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check_external --build-config $1
diff --git a/scripts/run_checkshell.in b/scripts/run_checkshell.in
@@ -10,4 +10,4 @@ if [ $# -ne 1 ]; then
 	exit 1
 fi
 
-ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -R testscr_check --build-config $1
+ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -R testscr_check --build-config $1 || ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -R testscr_check --build-config $1
diff --git a/scripts/run_memcheck.in b/scripts/run_memcheck.in
@@ -5,4 +5,4 @@ if [ $# -ne 1 ]; then
 	exit 1
 fi
 
-ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -T memcheck --output-on-failure --build-config $1 -LE memleak
+ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -T memcheck --build-config $1 -LE memleak || ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -T memcheck --output-on-failure --build-config $1 -LE memleak
diff --git a/scripts/run_nocheckshell.in b/scripts/run_nocheckshell.in
@@ -10,4 +10,4 @@ if [ $# -ne 1 ]; then
 	exit 1
 fi
 
-ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check --build-config $1
+ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process -E testscr_check --build-config $1 || ctest -j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check --build-config $1
diff --git a/scripts/run_nokdbtests.in b/scripts/run_nokdbtests.in
@@ -7,4 +7,4 @@ fi
 
 # run all tests not writing to disc
 
-ctest -j@PROCESSOR_COUNT@ -LE kdbtests --force-new-ctest-process --output-on-failure --build-config $1
+ctest -j@PROCESSOR_COUNT@ -LE kdbtests --force-new-ctest-process --build-config $1 || ctest -j@PROCESSOR_COUNT@ -LE kdbtests --force-new-ctest-process --output-on-failure --build-config $1