Merge pull request #120 from jnbrunet/fix_ci

Fix issues with Linux CI on SOFA master
mimesis-inria · Mar 26, 2022 · 36756f7 · 36756f7
2 parents c871fe0 + 78d3a72
commit 36756f7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -137,7 +137,7 @@ jobs:
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
           modules: 'qtcharts qtwebengine'
           aqtversion: '==2.0.5'
-          # setup-python: true
+          setup-python: false
 
 
 #     SOFA

diff --git a/unittest/SofaCaribou/Mass/test_cariboumass.cpp b/unittest/SofaCaribou/Mass/test_cariboumass.cpp
@@ -47,6 +47,10 @@ TEST(CaribouMass, LinearTetrahedron) {
     createObject(root, "RequiredPlugin", {{"pluginName", "SofaComponentAll"}});
 #endif
 
+    // Some component to avoid warnings
+    createObject(root, "DefaultAnimationLoop");
+    createObject(root, "DefaultVisualManagerLoop");
+
     createObject(root, "RegularGridTopology", {{"name", "grid"}, {"min", "-7.5 -7.5 0"}, {"max", "7.5 7.5 80"}, {"n", "3 3 9"}});
 
     auto mo = dynamic_cast<sofa::component::container::MechanicalObject<sofa::defaulttype::Vec3Types> *>(
@@ -171,6 +175,10 @@ TEST(CaribouMass, LinearHexahedron) {
     createObject(root, "RequiredPlugin", {{"pluginName", "SofaComponentAll"}});
 #endif
 
+    // Some component to avoid warnings
+    createObject(root, "DefaultAnimationLoop");
+    createObject(root, "DefaultVisualManagerLoop");
+
     createObject(root, "RegularGridTopology", {{"name", "grid"}, {"min", "-7.5 -7.5 0"}, {"max", "7.5 7.5 80"}, {"n", "3 3 9"}});
 
     auto mo = dynamic_cast<sofa::component::container::MechanicalObject<sofa::defaulttype::Vec3Types> *>(

diff --git a/unittest/SofaCaribou/ODE/test_backward_euler.cpp b/unittest/SofaCaribou/ODE/test_backward_euler.cpp
@@ -55,6 +55,11 @@ TEST(BackwardEulerODESolver, Beam) {
 #if (defined(SOFA_VERSION) && SOFA_VERSION > 201299)
     createObject(root, "RequiredPlugin", {{"pluginName", "SofaTopologyMapping"}});
 #endif
+
+    // Some component to avoid warnings
+    createObject(root, "DefaultAnimationLoop");
+    createObject(root, "DefaultVisualManagerLoop");
+
     createObject(root, "RegularGridTopology", {{"name", "grid"}, {"min", "-7.5 -7.5 0"}, {"max", "7.5 7.5 80"}, {"n", "3 3 9"}});
 
     auto meca = createChild(root, "meca");

diff --git a/unittest/SofaCaribou/ODE/test_static.cpp b/unittest/SofaCaribou/ODE/test_static.cpp
@@ -47,6 +47,9 @@ TEST(StaticODESolver, InitSofaSolver) {
 
     setSimulation(new sofa::simulation::graph::DAGSimulation());
     auto root = getSimulation()->createNewNode("root");
+#if (defined(SOFA_VERSION) && SOFA_VERSION >= 201200)
+    createObject(root, "RequiredPlugin", {{"pluginName", "SofaBaseLinearSolver"}});
+#endif
     createObject(root, "DefaultAnimationLoop");
     createObject(root, "DefaultVisualManagerLoop");
     createObject(root, "StaticODESolver", {{"printLog", "true"}});
@@ -64,6 +67,9 @@ TEST(StaticODESolver, InitCaribouSolver) {
 
     setSimulation(new sofa::simulation::graph::DAGSimulation());
     auto root = getSimulation()->createNewNode("root");
+#if (defined(SOFA_VERSION) && SOFA_VERSION >= 201200)
+    createObject(root, "RequiredPlugin", {{"pluginName", "SofaBaseLinearSolver"}});
+#endif
     createObject(root, "DefaultAnimationLoop");
     createObject(root, "DefaultVisualManagerLoop");
     createObject(root, "StaticODESolver", {{"printLog", "true"}});