Pr comment + formatting

aws · Oct 4, 2023 · 1c94dbe · 1c94dbe
1 parent b127f83
commit 1c94dbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -529,7 +529,9 @@ if (BUILD_TESTING)
         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,
+        # "detect_odr_violation" detects violations of the "one definition rule",
+        # ensuring that symbols are only defined once.
+        # But 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})

diff --git a/codebuild/spec/buildspec_ktls.yml b/codebuild/spec/buildspec_ktls.yml
@@ -15,9 +15,10 @@ phases:
     commands:
       - codebuild-breakpoint
       - |
-        ssh -p 2222 codebuild@localhost \
-            "cd s2n-tls; sudo modprobe tls; \
+        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'"
+                'source ./nix/shell.sh && clean && configure && build && unit' \
+        "