Fixes after more thorough testing

CMakeLists.txt

@@ -528,6 +528,15 @@ if (BUILD_TESTING)
         endif()
         set(UNIT_TEST_ENVS ${UNIT_TEST_ENVS} TSAN_OPTIONS=${TSAN_OPTIONS})
     endif()
+    if(ASAN)
+        # Some of our unit tests intentionally include *.c files for testing,
+        # resulting in duplicate global values.
+        set(ASAN_OPTIONS detect_odr_violation=0)
+        if(DEFINED ENV{ASAN_OPTIONS})
+            set(ASAN_OPTIONS "${ASAN_OPTIONS} $ENV{ASAN_OPTIONS}")
+        endif()
+        set(UNIT_TEST_ENVS ${UNIT_TEST_ENVS} ASAN_OPTIONS=${ASAN_OPTIONS})
+    endif()
     message(STATUS "Running tests with environment: ${UNIT_TEST_ENVS}")
 
     file(GLOB UNITTESTS_SRC "tests/unit/*.c")

codebuild/spec/buildspec_ktls.yml

@@ -1,8 +1,5 @@
 ---
 version: 0.2
-env:
-  variables:
-    S2N_KTLS_TESTING_EXPECTED: true
 phases:
   install:
     commands:
@@ -17,4 +14,10 @@ phases:
   build:
     commands:
       - codebuild-breakpoint
-      - ssh -p 2222 codebuild@localhost "cd s2n-tls; sudo modprobe tls; nix develop .#openssl111 --command bash -c 'source ./nix/shell.sh && clean && configure && build && unit'"
+      - |
+        ssh -p 2222 codebuild@localhost \
+            "cd s2n-tls; sudo modprobe tls; \
+            export S2N_CMAKE_OPTIONS=${S2N_CMAKE_OPTIONS}; \
+            export S2N_KTLS_TESTING_EXPECTED=1; \
+            nix develop .#openssl111 --command bash -c \
+                'source ./nix/shell.sh && clean && configure && build && unit'"