From b763c54bb9833d3383e03b110e302923be8ed380 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:15:24 -0700 Subject: [PATCH 01/23] lets try this --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eff75483f..c3b4f59be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,11 @@ jobs: windows: runs-on: windows-2022 # latest steps: + - name: Setup MSVC dev command prompt + uses: TheMrMilchmann/setup-msvc-dev@v3 + with: + arch: x64 + toolset: 14.38.33130 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 774282eb056ea08ae18d761bad8ae23edac70ccc Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:18:41 -0700 Subject: [PATCH 02/23] rerun --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3b4f59be..52af34e80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: windows: runs-on: windows-2022 # latest steps: - - name: Setup MSVC dev command prompt + - name: Setup MSVC dev command prompt a uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 From eb97c25a68315779e1a48f0ea363efb93fa7fdbd Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:27:15 -0700 Subject: [PATCH 03/23] or this --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52af34e80..c172a9d88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14.38.33130 + toolset: 14 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 7bc1fdde8ca99c19d42abe359985aae2e9cd6f5b Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:32:31 -0700 Subject: [PATCH 04/23] enable asan --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c172a9d88..88eb41074 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DENABLE_SANITIZERS=ON windows-vc16: runs-on: windows-2022 # latest From 12abac5b764c39b99fde74fac4d17bfe483a2220 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:52:17 -0700 Subject: [PATCH 05/23] use latest --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88eb41074..6005e35f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14 + #toolset: 14 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 285892d6b933dc39145139d2e655bd9b055ef97c Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 15:59:46 -0700 Subject: [PATCH 06/23] fix win flags --- cmake/AwsSanitizers.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index c078575c1..c49b3fd14 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -65,8 +65,13 @@ function(aws_add_sanitizers target) endforeach() if(PRESENT_SANITIZERS) - target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) - target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") + if(MSVC) + target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) + target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") + else + target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) + target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") + endif string(REPLACE "," ";" PRESENT_SANITIZERS "${PRESENT_SANITIZERS}") set(${target}_SANITIZERS ${PRESENT_SANITIZERS} PARENT_SCOPE) From fffd247c9446bc8b15074d181a4c9ead96766a33 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:03:52 -0700 Subject: [PATCH 07/23] cmake --- cmake/AwsSanitizers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index c49b3fd14..bc36e7b3b 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -68,10 +68,10 @@ function(aws_add_sanitizers target) if(MSVC) target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") - else + else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") - endif + endif() string(REPLACE "," ";" PRESENT_SANITIZERS "${PRESENT_SANITIZERS}") set(${target}_SANITIZERS ${PRESENT_SANITIZERS} PARENT_SCOPE) From 2dade8595398338ed13df1e3c5b8a9436607f1e7 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:10:19 -0700 Subject: [PATCH 08/23] 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6005e35f1..88eb41074 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - #toolset: 14 + toolset: 14 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 3551df426b793e1bf0b108470f668559d2ea9b09 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:16:08 -0700 Subject: [PATCH 09/23] explicit ver --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88eb41074..c8e7b280e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14 + toolset: 14.38.33180 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 4c2330b6e8726c5b7569d31e09883d738cffc5a3 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:42:42 -0700 Subject: [PATCH 10/23] add libs --- .github/workflows/ci.yml | 2 +- cmake/AwsSanitizers.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8e7b280e..88eb41074 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14.38.33180 + toolset: 14 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index bc36e7b3b..4b11b80eb 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -67,7 +67,11 @@ function(aws_add_sanitizers target) if(PRESENT_SANITIZERS) if(MSVC) target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) - target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") + # target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") + target_link_libraries(${PROJECT_NAME} PUBLIC + $<$:clang_rt.asan_dynamic-x86_64> + $<$:clang_rt.asan_dynamic_runtime_thunk-x86_64> + ) else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") From c25d157cd15f88f791a3b2e3058baaf0b5c649cc Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:47:24 -0700 Subject: [PATCH 11/23] no link --- cmake/AwsSanitizers.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index 4b11b80eb..171de74c6 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -68,9 +68,9 @@ function(aws_add_sanitizers target) if(MSVC) target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) # target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") - target_link_libraries(${PROJECT_NAME} PUBLIC - $<$:clang_rt.asan_dynamic-x86_64> - $<$:clang_rt.asan_dynamic_runtime_thunk-x86_64> + #target_link_libraries(${PROJECT_NAME} PUBLIC + # $<$:clang_rt.asan_dynamic-x86_64> + # $<$:clang_rt.asan_dynamic_runtime_thunk-x86_64> ) else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) From 0207e3044bb91d9966a71cfe6369627569db6597 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:48:36 -0700 Subject: [PATCH 12/23] typo --- cmake/AwsSanitizers.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index 171de74c6..14001bd8d 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -71,7 +71,6 @@ function(aws_add_sanitizers target) #target_link_libraries(${PROJECT_NAME} PUBLIC # $<$:clang_rt.asan_dynamic-x86_64> # $<$:clang_rt.asan_dynamic_runtime_thunk-x86_64> - ) else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") From 73e3f0b3bc0ee7c363904d8452153c0b92b423c3 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:53:17 -0700 Subject: [PATCH 13/23] link libs --- cmake/AwsSanitizers.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index 14001bd8d..b59db3b7a 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -68,9 +68,7 @@ function(aws_add_sanitizers target) if(MSVC) target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) # target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") - #target_link_libraries(${PROJECT_NAME} PUBLIC - # $<$:clang_rt.asan_dynamic-x86_64> - # $<$:clang_rt.asan_dynamic_runtime_thunk-x86_64> + target_link_libraries(${TARGET} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64) else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") From 1c7297285dab6da78837a5648c0d63d1fec159da Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 16:55:38 -0700 Subject: [PATCH 14/23] target --- cmake/AwsSanitizers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index b59db3b7a..45cafff10 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -68,7 +68,7 @@ function(aws_add_sanitizers target) if(MSVC) target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) # target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") - target_link_libraries(${TARGET} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64) + target_link_libraries(${target} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64) else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") From 81498f91c70217d484f8e37bfd16434ba961285b Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 17:01:47 -0700 Subject: [PATCH 15/23] check that asan worked --- tests/uri_test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/uri_test.c b/tests/uri_test.c index 410ff411d..7fb7a20d0 100644 --- a/tests/uri_test.c +++ b/tests/uri_test.c @@ -125,6 +125,7 @@ static int s_test_uri_no_port_parse(struct aws_allocator *allocator, void *ctx) expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); + return AWS_OP_SUCCESS; } @@ -163,6 +164,9 @@ static int s_test_uri_no_path_parse(struct aws_allocator *allocator, void *ctx) ASSERT_BIN_ARRAYS_EQUALS( expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); + + int *foo; + *foo = 5; return AWS_OP_SUCCESS; } From 910da38f08a5f7c8effbe5eb578f0258a6459a6a Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 17:05:22 -0700 Subject: [PATCH 16/23] lets init it first --- tests/uri_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/uri_test.c b/tests/uri_test.c index 7fb7a20d0..8da989b7b 100644 --- a/tests/uri_test.c +++ b/tests/uri_test.c @@ -165,7 +165,7 @@ static int s_test_uri_no_path_parse(struct aws_allocator *allocator, void *ctx) expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); - int *foo; + int *foo = NULL; *foo = 5; return AWS_OP_SUCCESS; } From edd3db3467161aacc4094a13b6bd64ac0343542b Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 17:12:15 -0700 Subject: [PATCH 17/23] do we need this --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88eb41074..94cf79a27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,11 +108,6 @@ jobs: windows: runs-on: windows-2022 # latest steps: - - name: Setup MSVC dev command prompt a - uses: TheMrMilchmann/setup-msvc-dev@v3 - with: - arch: x64 - toolset: 14 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 07d86e875ee180f11870a4167c57b96401c77302 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 23:54:02 -0700 Subject: [PATCH 18/23] clean up --- .github/workflows/ci.yml | 13 +++++++++++++ cmake/AwsSanitizers.cmake | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94cf79a27..940fb856d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,19 @@ jobs: windows: runs-on: windows-2022 # latest steps: + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" + python builder.pyz build -p ${{ env.PACKAGE_NAME }} + + windows-sanitizer: + runs-on: windows-2022 # latest + steps: + - name: Setup MSVC dev env (san, etc...) + uses: TheMrMilchmann/setup-msvc-dev@v3 + with: + arch: x64 + # note: default sanitizer pair is address,undefined. win currently only supports address. - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index 45cafff10..387e21553 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -66,9 +66,13 @@ function(aws_add_sanitizers target) if(PRESENT_SANITIZERS) if(MSVC) - target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) - # target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") - target_link_libraries(${target} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64) + if(AWS_ARCH_INTEL_X64) + target_compile_options(${target} PRIVATE -fsanitize=${PRESENT_SANITIZERS}) + target_link_libraries(${target} PRIVATE clang_rt.asan_dynamic-x86_64 clang_rt.asan_dynamic_runtime_thunk-x86_64) + else() + message("On Win platforms sanitizer is only supported on x86-64") + return() + endif() else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") From cc7de53a58fc59124c1db15dc0569191f8b52f36 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 1 Jul 2024 23:56:04 -0700 Subject: [PATCH 19/23] remove regular win --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 940fb856d..928c2f5f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,14 +105,6 @@ jobs: aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF - windows: - runs-on: windows-2022 # latest - steps: - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} - windows-sanitizer: runs-on: windows-2022 # latest steps: From 1da92bc2cc0d0bbbb5bd0aab23ecb332eae7cddb Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Tue, 2 Jul 2024 00:00:08 -0700 Subject: [PATCH 20/23] unbreak the test --- tests/uri_test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/uri_test.c b/tests/uri_test.c index 8da989b7b..8573d4257 100644 --- a/tests/uri_test.c +++ b/tests/uri_test.c @@ -165,8 +165,6 @@ static int s_test_uri_no_path_parse(struct aws_allocator *allocator, void *ctx) expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); - int *foo = NULL; - *foo = 5; return AWS_OP_SUCCESS; } From eb7064bcf8f8a0d7dc0418b496cce8516e5c96ed Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Tue, 2 Jul 2024 09:03:43 -0700 Subject: [PATCH 21/23] revert test changes --- tests/uri_test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/uri_test.c b/tests/uri_test.c index 8573d4257..410ff411d 100644 --- a/tests/uri_test.c +++ b/tests/uri_test.c @@ -125,7 +125,6 @@ static int s_test_uri_no_port_parse(struct aws_allocator *allocator, void *ctx) expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); - return AWS_OP_SUCCESS; } @@ -164,7 +163,6 @@ static int s_test_uri_no_path_parse(struct aws_allocator *allocator, void *ctx) ASSERT_BIN_ARRAYS_EQUALS( expected_request_uri.ptr, expected_request_uri.len, uri.path_and_query.ptr, uri.path_and_query.len); aws_uri_clean_up(&uri); - return AWS_OP_SUCCESS; } From 24ca6a669714942161b156386cd3e115154d3e9b Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Tue, 2 Jul 2024 10:20:40 -0700 Subject: [PATCH 22/23] make it private --- cmake/AwsSanitizers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index 387e21553..eb5bcb382 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -75,7 +75,7 @@ function(aws_add_sanitizers target) endif() else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) - target_link_libraries(${target} PUBLIC "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") + target_link_libraries(${target} PRIVATE "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") endif() string(REPLACE "," ";" PRESENT_SANITIZERS "${PRESENT_SANITIZERS}") From 8e2c6280045eaf2e39876a3e308f9a447c6926de Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Wed, 3 Jul 2024 14:14:32 -0700 Subject: [PATCH 23/23] remove linker flag --- cmake/AwsSanitizers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AwsSanitizers.cmake b/cmake/AwsSanitizers.cmake index eb5bcb382..1f628112d 100644 --- a/cmake/AwsSanitizers.cmake +++ b/cmake/AwsSanitizers.cmake @@ -75,7 +75,7 @@ function(aws_add_sanitizers target) endif() else() target_compile_options(${target} PRIVATE -fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}) - target_link_libraries(${target} PRIVATE "-fno-omit-frame-pointer -fsanitize=${PRESENT_SANITIZERS}") + target_link_libraries(${target} PUBLIC "-fsanitize=${PRESENT_SANITIZERS}") endif() string(REPLACE "," ";" PRESENT_SANITIZERS "${PRESENT_SANITIZERS}")