still not fast enough

zchrissirhcz · Nov 20, 2024 · 6800ee2 · 6800ee2
1 parent 161f6dc
commit 6800ee2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,8 @@ jobs:
           ninjaVersion: "^1.12.1"
 
       - name: Build
-        run: python test.py
+        #run: python test.py
+        run: cmake -S tests/artifacts_path -B build/artifacts_path -G Ninja -DCMAKE_TOOLCHAIN_FILE="../../toolchains/Windows.MSVC.toolchain.cmake"
 
   build_macos:
     runs-on: macos-latest

diff --git a/test.py b/test.py
@@ -52,18 +52,19 @@ def check_build(self, project_name, args=''):
     def test_artifact_path(self):
         if PLATFORM.startswith('vs'):
             # Ninja Multi-Config
-            self.check_generate('artifacts_path', args='-G "Ninja Multi-Config" -DCMAKE_TOOLCHAIN_FILE="../../toolchains/Windows.MSVC.toolchain.cmake"')
-            self.check_build('artifacts_path', '--config Release')
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/foo_static.lib'))
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/foo_shared.dll'))
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/hello.exe'))
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/subfoo_static.lib'))
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/subfoo_shared.dll'))
-            self.assertTrue(os.path.exists('build/artifacts_path/Release/subhello.exe'))
-            shutil.rmtree('build/artifacts_path')
+            # self.check_generate('artifacts_path', args='-G "Ninja Multi-Config" -DCMAKE_TOOLCHAIN_FILE="../../toolchains/Windows.MSVC.toolchain.cmake"')
+            # self.check_build('artifacts_path', '--config Release')
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/foo_static.lib'))
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/foo_shared.dll'))
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/hello.exe'))
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/subfoo_static.lib'))
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/subfoo_shared.dll'))
+            # self.assertTrue(os.path.exists('build/artifacts_path/Release/subhello.exe'))
+            # shutil.rmtree('build/artifacts_path')
 
             # Ninja
-            self.check_generate('artifacts_path', args='-G Ninja -DCMAKE_TOOLCHAIN_FILE="../../toolchains/Windows.MSVC.toolchain.cmake"')
+            out = self.check_generate('artifacts_path', args='-G Ninja -DCMAKE_TOOLCHAIN_FILE="../../toolchains/Windows.MSVC.toolchain.cmake"')
+            print(out)
             self.check_build('artifacts_path', '--config Release')
             self.assertTrue(os.path.exists('build/artifacts_path/foo_static.lib'))
             self.assertTrue(os.path.exists('build/artifacts_path/foo_shared.dll'))