Removing leak-check=all

aws · Oct 18, 2024 · 9add151 · 9add151
1 parent ac6ac5b
commit 9add151
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -511,7 +511,7 @@ if (BUILD_TESTING)
     # We only run this on OpenSSL 1.1.1 because there are hundreds of false positives in other libcryptos.
     # Tracking issue: https://github.com/aws/s2n-tls/issues/4777
     if ($ENV{S2N_LIBCRYPTO} MATCHES "openssl-1.1.1")
-        set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT} --run-libc-freeres=yes --errors-for-leak-kinds=all --show-leak-kinds=all")
+        set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT} --run-libc-freeres=yes --show-leak-kinds=all")
     else()
         set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT} --run-libc-freeres=no")
     endif()

diff --git a/codebuild/bin/test_exec_leak.sh b/codebuild/bin/test_exec_leak.sh
@@ -83,7 +83,7 @@ cc -Iapi build/detect_exec_leak_finish.c build/lib/libs2n.so -o build/bin/detect
 valgrind_log_dir=valgrind_log_dir
 for test_file in detect_exec_leak detect_exec_leak_finish; do
     LD_LIBRARY_PATH="build/lib:$TARGET_LIBCRYPTO_PATH/lib:$LD_LIBRARY_PATH" S2N_VALGRIND=1 \
-        valgrind --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all \
+        valgrind --leak-check=full --show-leak-kinds=all \
         --run-libc-freeres=yes -q --gen-suppressions=all --track-fds=yes \
         --leak-resolution=high --undef-value-errors=no --trace-children=yes \
         --suppressions=tests/unit/valgrind.suppressions --log-file="build/$valgrind_log_dir/$test_file" \

diff --git a/tests/unit/Makefile b/tests/unit/Makefile
@@ -88,7 +88,6 @@ $(PEDANTIC_VALGRIND_TESTS)::
 		--num-callers=40 \
 		--undef-value-errors=no \
 		--show-leak-kinds=all \
-		--errors-for-leak-kinds=all \
 		--suppressions=valgrind.suppressions \
 	./$(@:.pedantic_valgrind=)
 

diff --git a/tests/unit/s2n_fips_test.c b/tests/unit/s2n_fips_test.c
@@ -49,5 +49,6 @@ int main()
         }
     }
 
-    END_TEST();
+    EXPECT_SUCCESS(s2n_cleanup_final());
+    END_TEST_NO_INIT();
 }
diff --git a/tests/unit/s2n_fork_generation_number_test.c b/tests/unit/s2n_fork_generation_number_test.c
@@ -279,7 +279,7 @@ static int s2n_test_case_pthread_atfork_cb(struct fgn_test_case *test_case)
 
     EXPECT_EQUAL(s2n_unit_tests_common(test_case), S2N_SUCCESS);
 
-    EXPECT_SUCCESS(s2n_cleanup());
+    EXPECT_SUCCESS(s2n_cleanup_final());
 
     return S2N_SUCCESS;
 }

diff --git a/tests/unit/s2n_random_test.c b/tests/unit/s2n_random_test.c
@@ -671,7 +671,7 @@ static int s2n_random_test_case_default_cb(struct random_test_case *test_case)
 
     EXPECT_EQUAL(s2n_common_tests(test_case), S2N_SUCCESS);
 
-    EXPECT_SUCCESS(s2n_cleanup());
+    EXPECT_SUCCESS(s2n_cleanup_final());
 
     return EXIT_SUCCESS;
 }

diff --git a/tests/unit/s2n_seccomp_handshake_test.c b/tests/unit/s2n_seccomp_handshake_test.c
@@ -41,6 +41,7 @@ int main(int argc, char **argv)
      *
      * An application using s2n-tls with seccomp would need to do the same.
      */
+    EXPECT_SUCCESS(s2n_enable_atexit());
     EXPECT_SUCCESS(s2n_init());
 
     /* No unexpected syscalls allowed beyond this point */