Make ctest always print output on failure

aws · Jun 13, 2023 · aa71423 · aa71423
1 parent b4aee0c
commit aa71423
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/.github/s2n_bsd.sh b/.github/s2n_bsd.sh
@@ -13,7 +13,6 @@
 # permissions and limitations under the License.
 #
 set -eu
-export CTEST_OUTPUT_ON_FAILURE=1
 
 # FreeBSD and OpenBSD have different ways of getting CPU count
 # see https://serverfault.com/questions/203207/how-do-i-count-the-number-of-processors-on-an-openbsd-system

diff --git a/.github/s2n_osx.sh b/.github/s2n_osx.sh
@@ -16,7 +16,6 @@
 set -eu
 source codebuild/bin/s2n_setup_env.sh
 
-export CTEST_OUTPUT_ON_FAILURE=1
 BREWINSTLLPATH=$(brew --prefix [email protected])
 OPENSSL_1_1_1_INSTALL_DIR="${BREWINSTLLPATH:-"/usr/local/Cellar/[email protected]/1.1.1?"}"
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -504,6 +504,7 @@ if (BUILD_TESTING)
     add_library(allocator_overrides SHARED ${TEST_LD_PRELOAD})
 
     set(UNIT_TEST_ENVS S2N_DONT_MLOCK=1)
+    set(UNIT_TEST_ENVS ${UNIT_TEST_ENVS} CTEST_OUTPUT_ON_FAILURE=1)
     if(TSAN)
         set(TSAN_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/.tsan_suppressions)
         if(NOT EXISTS ${TSAN_SUPPRESSIONS_FILE})

diff --git a/codebuild/bin/s2n_codebuild.sh b/codebuild/bin/s2n_codebuild.sh
@@ -106,8 +106,8 @@ run_integration_v2_tests() {
     cd ./build/
     for test_name in $TOX_TEST_NAME; do
       test="${test_name//test_/}"
-      echo "Running... ctest --no-tests=error --output-on-failure --verbose -R ^integrationv2_${test}$"
-      ctest --no-tests=error --output-on-failure --verbose -R ^integrationv2_${test}$
+      echo "Running... ctest --no-tests=error --verbose -R ^integrationv2_${test}$"
+      ctest --no-tests=error --verbose -R ^integrationv2_${test}$
     done
 }
 
@@ -120,7 +120,7 @@ run_unit_tests() {
             -DEXPERIMENTAL_TREAT_WARNINGS_AS_ERRORS=on
     cmake --build ./build -- -j $(nproc)
     test_linked_libcrypto ./build/bin/s2nc
-    cmake --build build/ --target test -- ARGS="-L unit --output-on-failure -j $(nproc)"
+    cmake --build build/ --target test -- ARGS="-L unit -j $(nproc)"
 }
 
 # Run Multiple tests on one flag.

diff --git a/codebuild/bin/s2n_codebuild_al2.sh b/codebuild/bin/s2n_codebuild_al2.sh
@@ -32,7 +32,7 @@ fi
 case "$TESTS" in
   "unit") cmake . -Bbuild -DCMAKE_EXE_LINKER_FLAGS="-lcrypto -lz" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -D${CMAKE_PQ_OPTION} -DS2N_BLOCK_NONPORTABLE_OPTIMIZATIONS=True
           cmake --build ./build -j $(nproc)
-          cmake --build ./build --target test -- ARGS="-L unit --output-on-failure"
+          cmake --build ./build --target test -- ARGS="-L unit"
 	  ;;
   *) echo "Unknown test"
      exit 1;;

diff --git a/codebuild/spec/buildspec_tsan.yml b/codebuild/spec/buildspec_tsan.yml
@@ -22,4 +22,4 @@ phases:
   post_build:
     on-failure: ABORT
     commands:
-      - CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=$(nproc) make -C build test
+      - CTEST_PARALLEL_LEVEL=$(nproc) make -C build test
diff --git a/codebuild/spec/buildspec_unit_coverage.yml b/codebuild/spec/buildspec_unit_coverage.yml
@@ -38,6 +38,6 @@ phases:
   post_build:
     on-failure: ABORT
     commands:
-      - LLVM_PROFILE_FILE="ut_%p.profraw" CTEST_PARALLEL_LEVEL=$(nproc) cmake --build ./build --target test ARGS="--output-on-failure -L unit"
+      - LLVM_PROFILE_FILE="ut_%p.profraw" CTEST_PARALLEL_LEVEL=$(nproc) cmake --build ./build --target test ARGS="-L unit"
       - $CB_BIN_DIR/coverage_report.sh
       - $CB_BIN_DIR/coverage_upload.sh