From 55f549a4046f8204bd287125c2ad532f332bbd1c Mon Sep 17 00:00:00 2001
From: Abhijeet Patil <abhijeet@neon.tech>
Date: Thu, 18 Jan 2024 14:37:17 +0000
Subject: [PATCH] chaning debug build to gcc

---
 .github/workflows/build_and_test.yml | 44 ++++++++++++++--------------
 Makefile                             |  4 +--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1940ded346..3fabf00319 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -141,7 +141,7 @@ jobs:
 
       # Some of our rust modules use FFI and need those to be checked
       - name: Get postgres headers
-        run: CC=clang CARGO_BUILD_FLAGS="--features=testing" make postgres-headers -j$(nproc)
+        run: CARGO_BUILD_FLAGS="--features=testing" make postgres-headers -j$(nproc)
 
       # cargo hack runs the given cargo subcommand (clippy in this case) for all feature combinations.
       # This will catch compiler & clippy warnings in all feature combinations.
@@ -271,7 +271,7 @@ jobs:
           strict_string_checks=1:check_initialization_order=1:strict_init_order=1:detect_stack_use_after_return=0"
             UBSAN_OPTIONS="abort_on_error=1:print_stacktrace=1"
             RUSTFLAGS="-C linker=clang"
-            CC=clang
+            CC=gcc
           elif [[ $BUILD_TYPE == "release" ]]; then
             cov_prefix=""
             CARGO_FLAGS="--locked --release"
@@ -353,26 +353,26 @@ jobs:
         run: |
           ${cov_prefix} mold -run cargo build $CARGO_FLAGS $CARGO_FEATURES --bins --tests
 
-#      - name: Run rust tests
-#        run: |
-#          ${cov_prefix} cargo nextest run $CARGO_FLAGS $CARGO_FEATURES
-#
-#          # Run separate tests for real S3
-#          export ENABLE_REAL_S3_REMOTE_STORAGE=nonempty
-#          export REMOTE_STORAGE_S3_BUCKET=neon-github-ci-tests
-#          export REMOTE_STORAGE_S3_REGION=eu-central-1
-#          # Avoid `$CARGO_FEATURES` since there's no `testing` feature in the e2e tests now
-#          ${cov_prefix} cargo nextest run $CARGO_FLAGS -E 'package(remote_storage)' -E 'test(test_real_s3)'
-#
-#          # Run separate tests for real Azure Blob Storage
-#          # XXX: replace region with `eu-central-1`-like region
-#          export ENABLE_REAL_AZURE_REMOTE_STORAGE=y
-#          export AZURE_STORAGE_ACCOUNT="${{ secrets.AZURE_STORAGE_ACCOUNT_DEV }}"
-#          export AZURE_STORAGE_ACCESS_KEY="${{ secrets.AZURE_STORAGE_ACCESS_KEY_DEV }}"
-#          export REMOTE_STORAGE_AZURE_CONTAINER="${{ vars.REMOTE_STORAGE_AZURE_CONTAINER }}"
-#          export REMOTE_STORAGE_AZURE_REGION="${{ vars.REMOTE_STORAGE_AZURE_REGION }}"
-#          # Avoid `$CARGO_FEATURES` since there's no `testing` feature in the e2e tests now
-#          ${cov_prefix} cargo nextest run $CARGO_FLAGS -E 'package(remote_storage)' -E 'test(test_real_azure)'
+      - name: Run rust tests
+        run: |
+          ${cov_prefix} cargo nextest run $CARGO_FLAGS $CARGO_FEATURES -E 'not test()'
+
+          # Run separate tests for real S3
+          export ENABLE_REAL_S3_REMOTE_STORAGE=nonempty
+          export REMOTE_STORAGE_S3_BUCKET=neon-github-ci-tests
+          export REMOTE_STORAGE_S3_REGION=eu-central-1
+          # Avoid `$CARGO_FEATURES` since there's no `testing` feature in the e2e tests now
+          ${cov_prefix} cargo nextest run $CARGO_FLAGS -E 'package(remote_storage)' -E 'test(test_real_s3)'
+
+          # Run separate tests for real Azure Blob Storage
+          # XXX: replace region with `eu-central-1`-like region
+          export ENABLE_REAL_AZURE_REMOTE_STORAGE=y
+          export AZURE_STORAGE_ACCOUNT="${{ secrets.AZURE_STORAGE_ACCOUNT_DEV }}"
+          export AZURE_STORAGE_ACCESS_KEY="${{ secrets.AZURE_STORAGE_ACCESS_KEY_DEV }}"
+          export REMOTE_STORAGE_AZURE_CONTAINER="${{ vars.REMOTE_STORAGE_AZURE_CONTAINER }}"
+          export REMOTE_STORAGE_AZURE_REGION="${{ vars.REMOTE_STORAGE_AZURE_REGION }}"
+          # Avoid `$CARGO_FEATURES` since there's no `testing` feature in the e2e tests now
+          ${cov_prefix} cargo nextest run $CARGO_FLAGS -E 'package(remote_storage)' -E 'test(test_real_azure)'
 
       - name: Install rust binaries
         run: |
diff --git a/Makefile b/Makefile
index 5c7815588c..e3ed4193e4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ ifeq ($(BUILD_TYPE),release)
 else ifeq ($(BUILD_TYPE),debug)
 	PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
 	PG_CFLAGS = -O0 -g3 $(CFLAGS)
-	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=function -Wno-cast-function-type-strict
-	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libsan
+	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=function -fno-sanitize=alignment -Wno-cast-function-type-strict
+	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libasan -static-libubsan
 else
 	$(error Bad build type '$(BUILD_TYPE)', see Makefile for options)
 endif