Premake combined ASAN, LSAN, UBSan configurations into a single ASan_…

…LSan_UBSan configuration 10/30/2024 | 24w44a2
GamesTrap · Oct 30, 2024 · 071cd32 · 071cd32
1 parent 18763f9
commit 071cd32
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 46 deletions.
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         compiler: [clang, gcc]
-        configuration: [Debug, Release, RelWithDebInfo, Profiling, ASan, TSan, LSan, UBSan]
+        configuration: [Debug, Release, RelWithDebInfo, Profiling, ASan_LSan_UBSan, TSan]
         clang_version: [19]
         gcc_version: [14]
     env:
@@ -282,7 +282,7 @@ jobs:
     strategy:
       matrix:
         compiler: [clang, gcc]
-        configuration: [Debug, Release, RelWithDebInfo, Profiling, ASan, TSan, LSan, UBSan]
+        configuration: [Debug, Release, RelWithDebInfo, Profiling, ASan_LSan_UBSan, TSan]
     needs: build-linux
     steps:
       - name: Cleanup workspace

diff --git a/SITREPS.txt b/SITREPS.txt
@@ -5338,3 +5338,4 @@ SITREP 10/30/2024|24w44a2
     - Changed TRAP Engine version to 24w44a2(0.11.32)
     - GitHub Actions Added nightly build workflow ~<20 mins
     - GitHub Actions Only trigger Build-Docs when new tag is added ~<5 mins
+    - Premake combined ASAN, LSAN, UBSan configurations into a single ASan_LSan_UBSan configuration ~<5 mins
diff --git a/TRAP/src/Window/WindowingAPILinuxX11.cpp b/TRAP/src/Window/WindowingAPILinuxX11.cpp
@@ -4817,7 +4817,7 @@ void TRAP::INTERNAL::WindowingAPI::CreateKeyTablesX11()
 			std::string Name;
 		};
 
-		static constexpr std::array<Keys, 121u> KeyMap =
+		static const std::array<Keys, 121u> KeyMap =
 		{
             {
                 { .Key=TRAP::Input::Key::Grave_Accent, .Name="TLDE"}, { .Key=TRAP::Input::Key::One, .Name="AE01"},

diff --git a/UnitTests/src/Utils/Optional.cpp b/UnitTests/src/Utils/Optional.cpp
@@ -1582,11 +1582,13 @@ TEST_CASE("TRAP::Optional<T&>", "[utils][optional]")
         static constexpr i32 constexprFortyTwo = 42;
         static constexpr auto GetInt = [](i32){return 42;};
 
+#ifndef TRAP_ASAN
         static constexpr TRAP::Optional<const i32&> o16 = constexprFortyTwo;
         static constexpr auto o16r = o16.Transform(GetInt);
 
         static constexpr TRAP::Optional<const i32&> o20 = constexprFortyTwo;
         static constexpr auto o20r = std::move(o20).Transform(GetInt);
+#endif /*TRAP_ASAN*/
 
         static constexpr TRAP::Optional<i32&> o32 = TRAP::NullOpt;
         static constexpr auto o32r = o32.Transform(GetInt);

diff --git a/premake5.lua b/premake5.lua
@@ -53,9 +53,7 @@ workspace "TRAP"
 	filter "system:linux"
 		configurations
 		{
-			"ASan",
-			"UBSan",
-			"LSan",
+			"ASan_LSan_UBSan",
 			"TSan"
 		}
 
@@ -91,62 +89,27 @@ workspace "TRAP"
 		optimize "Full"
 		symbols "On"
 
-	filter {"language:C or C++", "configurations:ASAN"}
-		defines
-		{
-			"TRAP_RELWITHDEBINFO",
-			"TRAP_ASAN"
-		}
-		runtime "Release"
-		optimize "Debug"
-		symbols "On"
-		buildoptions
-		{
-			"-fsanitize=address",
-			"-fno-omit-frame-pointer",
-			"-g"
-		}
-		linkoptions
-		{
-			"-fsanitize=address"
-		}
-
-	filter {"language:C or C++", "configurations:UBSAN"}
+	filter {"language:C or C++", "configurations:ASan_LSan_UBSan"}
 		defines
 		{
 			"TRAP_RELWITHDEBINFO",
+			"TRAP_ASAN",
+			"TRAP_LSAN",
 			"TRAP_UBSAN"
 		}
 		runtime "Release"
 		optimize "Debug"
 		symbols "On"
 		buildoptions
 		{
-			"-fsanitize=undefined",
+			"-fsanitize=address,leak,undefined",
 			"-fno-omit-frame-pointer",
 			"-g"
 		}
 		linkoptions
 		{
-			"-fsanitize=undefined"
-		}
-
-	filter {"language:C or C++", "configurations:LSAN"}
-		defines
-		{
-			"TRAP_RELWITHDEBINFO",
-			"TRAP_LSAN"
-		}
-		runtime "Release"
-		optimize "Debug"
-		symbols "On"
-		buildoptions
-		{
-			"-fsanitize=leak",
-			"-fno-omit-frame-pointer",
-			"-g"
+			"-fsanitize=address,leak,undefined"
 		}
-		linkoptions "-fsanitize=leak"
 
 	filter {"language:C or C++", "configurations:TSAN"}
 		defines