Fix multithreading issue

espressomd · Sep 22, 2018 · 7cac5fd · 7cac5fd
1 parent eed9856
commit 7cac5fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/maintainer/CI/build_cmake.sh b/maintainer/CI/build_cmake.sh
@@ -245,7 +245,7 @@ if $make_check; then
         done
     fi
     cmd "make -j${build_procs} check_unit_tests $make_params" || exit 1
-    cmd "make -j${build_procs} check_cmake_install $make_params" || exit 1
+    cmd "make check_cmake_install $make_params" || exit 1
 
     end "TEST"
 else

diff --git a/testsuite/cmake/BashUnitTests.sh b/testsuite/cmake/BashUnitTests.sh
@@ -185,7 +185,7 @@ function try_catch_silent() {
   detect_open_mpi || return 1
   (
     set -e  # exit from current subshell on first error
-    "$@" 1>/dev/null 2>/dev/null
+    "$@" 2>&1
   )
   return $?
 }
@@ -395,12 +395,13 @@ function assert_zero() {
 function assert_return_code() {
   try_catch_silent "$@"
   local retcode=$?
+  local log=$(try_catch_silent "$@")
   local message="non-zero return code (${retcode}) for command \`$*\`"
   if [ "${retcode}" -eq "0" ]
   then
     log_success
   else
-    log_failure "${message}"
+    log_failure "${message}" "${log}" $(ls /builds/espressomd/espresso/build/testsuite/cmake/install//tmp/espresso-unit-tests/lib/python2.7/dist-packages/espressomd 2>&1)
   fi
 }