Merge 44ef354 into 07effa8

Author: martelkr

.github/workflows/addressSanitization.yml

@@ -0,0 +1,34 @@
+name: AddressSanitization
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  BUILD_TYPE: Debug
+
+jobs:
+  ASAN:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install gtest
+      run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
+
+    - name: Write files
+      env: 
+        FILE_ONE: ${{ secrets.KRM_MAIN_FILE }}
+        FILE_TWO: ${{ secrets.KRM_SCND_FILE }}
+      run: |
+        echo "${FILE_ONE}" | base64 --decode > ${HOME}/key.pem |
+        echo "${FILE_TWO}" | base64 --decode > ${HOME}/scert.crt
+
+    - name: Build and test
+      run: |
+        cmake -DCMAKE_BUILD_TYPE=ASAN .
+        cmake --build . --config ASAN
+        ctest -VV -C ${{env.BUILD_TYPE}}  

CMakeLists.txt

@@ -11,9 +11,7 @@ SET(LICENSE "MIT")
 
 project(cppsocket VERSION ${project_version} LANGUAGES CXX)
 
-if (CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions(-DLINUX)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     add_definitions(-DLINUX)
 else()
     add_definitions(-DWINDOWS)

test/CMakeLists.txt

@@ -1,8 +1,13 @@
 if(CMAKE_COMPILER_IS_GNUCXX)
     if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
+        message(STATUS "Code Coverage")
         set(CMAKE_CXX_FLAGS "-g -O0 -Wall -Werror --coverage")
         set(CMAKE_C_FLAGS "-g -O0 -Wall -Werror --coverage")
+    elseif(CMAKE_BUILD_TYPE STREQUAL "ASAN")
+        message(STATUS "Address sanitization")
+        set(CMAKE_CXX_FLAGS "-O3 -Wall -Werror -fsanitize=address -static-libasan")
     else()
+        message(STATUS "Base GCC")
         set(CMAKE_CXX_FLAGS "-O3 -Wall -Werror")
     endif()
     find_package(OpenSSL REQUIRED)
@@ -11,13 +16,15 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
     set(CMAKE_CXX_FLAGS "-Wall /O2")
     if(DEFINED ENV{CI})
+        message(STATUS "MSVC Action")
         # github action CI needs
         set(GTEST_LIBRARY "D:/gtest/lib/gtest.lib")
         set(GTEST_INCLUDE_DIR "D:/gtest/include")
         set(GTEST_MAIN_LIBRARY "D:/gtest/lib/gtest_main.lib")
         set(OPENSSL_INCLUDE_DIR "C:/Program Files/OpenSSL/include")
         set(OPENSSL_LIBRARIES "C:/Program Files/OpenSSL/lib")
     else()
+        message(STATUS "MSVC Local")
         # this may not be needed or need changing but I needed it
         # this requires setting Windows environment settings for this user with these correct values
         set(GTEST_LIBRARY $ENV{GTEST_LIBRARY})
@@ -29,6 +36,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     find_package(OpenSSL REQUIRED)
     find_package(GTest REQUIRED)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    message(STATUS "CLANG")
     set(CMAKE_CXX_FLAGS "-O3 -Wall -Werror")
     find_package(OpenSSL REQUIRED)
     find_package(GTest REQUIRED)