Enable ctests

VTX-Molecular-Visualization · Nov 9, 2023 · 5aafc05 · 5aafc05
1 parent 1f6917f
commit 5aafc05
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/cmake_app.yml b/.github/workflows/cmake_app.yml
@@ -27,17 +27,17 @@ jobs:
     - name: Create default profile
       run: conan profile detect --force
 
-    - name: Create packages
+    - name: Create package
       working-directory: ${{env.CMAKELISTS_DIR}}
       run:  |
         conan export ../util
         conan export ../core
         conan export ../io/chemfiles
         conan export ../io
         conan export ../renderer
-        conan export .
-        conan create test --build=missing --settings=compiler.cppstd=20
+        conan create . --build=missing --settings=compiler.cppstd=20
+        
     
     - name: Test
       working-directory: ${{env.CMAKELISTS_DIR}}
-      run: ctest --verbose 
+      run: conan create test --build=missing --settings=compiler.cppstd=20
diff --git a/.github/workflows/cmake_core.yml b/.github/workflows/cmake_core.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Create default profile
       run: conan profile detect
 
-    - name: Create packages
+    - name: Create package
       working-directory: ${{env.CMAKELISTS_DIR}}
       run:  |
         conan export ../util

diff --git a/.github/workflows/cmake_io.yml b/.github/workflows/cmake_io.yml
@@ -27,15 +27,14 @@ jobs:
     - name: Create default profile
       run: conan profile detect
 
-    - name: Create packages
+    - name: Create package
       working-directory: ${{env.CMAKELISTS_DIR}}
       run:  |
         conan export ../util
         conan export ../core
         conan export chemfiles
-        conan export .
-        conan create test --build=missing --settings=compiler.cppstd=20
+        conan create . --build=missing --settings=compiler.cppstd=20
    
     - name: Test
       working-directory: ${{env.CMAKELISTS_DIR}}
-      run: ctest --verbose 
+      run: conan create test --build=missing --settings=compiler.cppstd=20
diff --git a/.github/workflows/cmake_renderer.yml b/.github/workflows/cmake_renderer.yml
@@ -27,21 +27,24 @@ jobs:
     - name: Create default profile
       run: conan profile detect --force
 
-    - name: Create packages
+    - name: Create package
       working-directory: ${{env.CMAKELISTS_DIR}}
       run:  |
         conan export ../util         
         conan export .
-        conan create test --build=missing --settings=compiler.cppstd=20 -c tools.system.package_manager:mode=install -c tools.system.package_manager:sudo=True
+         
+    - name: Test
+      working-directory: ${{env.CMAKELISTS_DIR}}
+      run: conan create test --build=missing --settings=compiler.cppstd=20
+
+    - name: Create benchmarker
+      working-directory: ${{env.CMAKELISTS_DIR}}
+      run:  |
         conan export ../core       
         conan export ../io/chemfiles
         conan export ../io
         conan create bench --build=missing --settings=compiler.cppstd=20 -c tools.system.package_manager:mode=install -c tools.system.package_manager:sudo=True
-         
-    - name: Test
-      working-directory: ${{env.CMAKELISTS_DIR}}
-      run: ctest --verbose    
-
+
 #    - name: Install
 #      if: runner.os == 'Windows'
 #      working-directory: ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_BUILD_DIR}}

diff --git a/.github/workflows/cmake_util.yml b/.github/workflows/cmake_util.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Create default profile
       run: conan profile detect
 
-    - name: Create packages
+    - name: Create package
       working-directory: ${{env.CMAKELISTS_DIR}}
       run: conan create . --build=missing --settings=compiler.cppstd=20
 

diff --git 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
@@ -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/renderer/test/conanfile.py b/lib/renderer/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/util/test/src/main.cpp b/lib/util/test/src/main.cpp
@@ -41,7 +41,7 @@ TEST_CASE( "Util::String", "[string]" )
 	REQUIRE( VTX::Util::String::floatToStr( f, 5 ) == "3.14159" );
 
 	str = "3.14159";
-	REQUIRE( VTX::Util::String::strToUint( str ) == 4 );
+	REQUIRE( VTX::Util::String::strToUint( str ) == 3 );
 }
 
 // filesystem.hpp