diff --git a/.github/workflows/cmake_util.yml b/.github/workflows/cmake_util.yml index 8650d4537..a055d2ca7 100644 --- a/.github/workflows/cmake_util.yml +++ b/.github/workflows/cmake_util.yml @@ -41,15 +41,9 @@ jobs: working-directory: ${{env.CMAKELISTS_DIR}} run: conan create . --build=missing --settings=compiler.cppstd=20 - - name: Build tests + - name: Test working-directory: ${{env.CMAKELISTS_DIR}} run: conan create test --build=missing --settings=compiler.cppstd=20 - - - name: Test - uses: threeal/ctest-action@v1.0.0 - with: - test-dir: ${{env.CMAKELISTS_DIR}}/build - build-config: Release - name: Upload dependencies working-directory: ${{env.CMAKELISTS_DIR}} diff --git a/lib/app/test/conanfile.py b/lib/app/test/conanfile.py index c8b05e169..7400143c8 100644 --- a/lib/app/test/conanfile.py +++ b/lib/app/test/conanfile.py @@ -27,6 +27,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/io/test/conanfile.py b/lib/io/test/conanfile.py index 84f9aabfd..5268941da 100644 --- a/lib/io/test/conanfile.py +++ b/lib/io/test/conanfile.py @@ -25,6 +25,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/python_binding/test/conanfile.py b/lib/python_binding/test/conanfile.py index 1d630811e..34ce71350 100644 --- a/lib/python_binding/test/conanfile.py +++ b/lib/python_binding/test/conanfile.py @@ -32,6 +32,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/renderer/test/conanfile.py b/lib/renderer/test/conanfile.py index 58fabd84e..3dd002e01 100644 --- a/lib/renderer/test/conanfile.py +++ b/lib/renderer/test/conanfile.py @@ -26,6 +26,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/tool/test/conanfile.py b/lib/tool/test/conanfile.py index 4c9833f5e..d050746d1 100644 --- a/lib/tool/test/conanfile.py +++ b/lib/tool/test/conanfile.py @@ -24,6 +24,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/tool/tools/mdprep/test/conanfile.py b/lib/tool/tools/mdprep/test/conanfile.py index b1a054335..6bb987c54 100644 --- a/lib/tool/tools/mdprep/test/conanfile.py +++ b/lib/tool/tools/mdprep/test/conanfile.py @@ -37,6 +37,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") # TODO uncomment this when build is stable def package(self): cmake = CMake(self) diff --git a/lib/ui/test/conanfile.py b/lib/ui/test/conanfile.py index f5e674e8b..7becddd85 100644 --- a/lib/ui/test/conanfile.py +++ b/lib/ui/test/conanfile.py @@ -43,6 +43,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self) diff --git a/lib/util/test/conanfile.py b/lib/util/test/conanfile.py index 92aa58d24..c2f6c8e1d 100644 --- a/lib/util/test/conanfile.py +++ b/lib/util/test/conanfile.py @@ -23,6 +23,7 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() + self.run("ctest --rerun-failed --output-on-failure") def package(self): cmake = CMake(self)