Add linux-gcc to project name.

bkaradzic · Oct 26, 2024 · ec66714 · ec66714
1 parent 6e87e04
commit ec66714
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
           { config: debug, binsuffix: Debug },
           { config: release, binsuffix: Release },
         ]
-    name: linux-${{ matrix.config }}64
+    name: linux-gcc-${{ matrix.config }}64
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout bx
@@ -92,7 +92,7 @@ jobs:
         run: |
           cd bx
           tools/bin/linux/genie --gcc=linux-gcc gmake
-          make -R -C .build/projects/gmake-linux config=${{ matrix.config }}64 -j$(nproc)
+          make -R -C .build/projects/gmake-linux-gcc config=${{ matrix.config }}64 -j$(nproc)
       - name: Check
         run: |
           cd bx

diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
@@ -290,13 +290,13 @@ function toolchain(_buildDir, _libDir)
 			location (path.join(_buildDir, "projects", _ACTION .. "-tvos-simulator"))
 
 		elseif "linux-gcc" == _OPTIONS["gcc"] then
-			location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
+			location (path.join(_buildDir, "projects", _ACTION .. "-linux-gcc"))
 
 		elseif "linux-gcc-afl" == _OPTIONS["gcc"] then
 			premake.gcc.cc  = "afl-gcc"
 			premake.gcc.cxx = "afl-g++"
 			premake.gcc.ar  = "ar"
-			location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
+			location (path.join(_buildDir, "projects", _ACTION .. "-linux-gcc"))
 
 		elseif "linux-clang" == _OPTIONS["gcc"] then
 			premake.gcc.cc  = "clang"

diff --git a/tests/filepath_test.cpp b/tests/filepath_test.cpp
@@ -127,15 +127,12 @@ TEST_CASE("FilePath temp", "[filepath]")
 	tmp.join("bx.test");
 	bx::removeAll(tmp, bx::ErrorIgnore{});
 
-	bx::Error err;
 	tmp.join("bx.test/abvgd/555333/test");
-	REQUIRE(bx::makeAll(tmp, &err) );
-	REQUIRE(err.isOk() );
+	REQUIRE(bx::makeAll(tmp, bx::ErrorAssert{}) );
 
 	tmp.set(bx::Dir::Temp);
 	tmp.join("bx.test");
-	REQUIRE(bx::removeAll(tmp, &err) );
-	REQUIRE(err.isOk() );
+	REQUIRE(bx::removeAll(tmp, bx::ErrorAssert{}) );
 }
 
 TEST_CASE("FilePath special", "[filepath]")

diff --git a/tests/math_test.cpp b/tests/math_test.cpp
@@ -11,6 +11,7 @@
 #include <stdint.h> // intXX_t
 #include <limits.h> // UCHAR_*
 
+#if !BX_CRT_MINGW
 TEST_CASE("isFinite, isInfinite, isNan", "[math]")
 {
 	for (uint64_t ii = 0; ii < UINT32_MAX; ii += rand()%(1<<13)+1)
@@ -21,7 +22,7 @@ TEST_CASE("isFinite, isInfinite, isNan", "[math]")
 		REQUIRE(::__isnanf(u.f)    == bx::isNan(u.f) );
 		REQUIRE(::__isfinitef(u.f) == bx::isFinite(u.f) );
 		REQUIRE(::__isinff(u.f)    == bx::isInfinite(u.f) );
-#elif BX_COMPILER_MSVC || BX_CRT_MINGW
+#elif BX_COMPILER_MSVC
 		REQUIRE(!!::isnan(u.f)    == bx::isNan(u.f) );
 		REQUIRE(!!::isfinite(u.f) == bx::isFinite(u.f) );
 		REQUIRE(!!::isinf(u.f)    == bx::isInfinite(u.f) );
@@ -32,6 +33,7 @@ TEST_CASE("isFinite, isInfinite, isNan", "[math]")
 #endif // BX_PLATFORM_OSX
 	}
 }
+#endif // !BX_CRT_MINGW
 
 bool log2_test(float _a)
 {