merge modifications

sofa-framework · Feb 12, 2024 · c52f675 · c52f675
2 parents dd7644d + 734983f
commit c52f675
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 31 deletions.
diff --git a/scripts/configure.sh b/scripts/configure.sh
@@ -373,6 +373,7 @@ elif in-array "build-scope-standard" "$BUILD_OPTIONS"; then
 elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     echo "Configuring with as much plugins/modules as possible (scope = full)"
     add-cmake-option "-DAPPLICATION_SOFAPHYSICSAPI=ON"
+    add-cmake-option "-DAPPLICATION_SOFAINFO=ON"
     add-cmake-option "-DSOFA_BUILD_TUTORIALS=ON"
     add-cmake-option "-DSOFA_BUILD_TESTS=ON"
     add-cmake-option "-DSOFA_DUMP_VISITOR_INFO=ON"
@@ -446,6 +447,7 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     add-cmake-option "-DPLUGIN_SOFASPHFLUID=ON"
     add-cmake-option "-DPLUGIN_COLLISIONOBBCAPSULE=ON"
     add-cmake-option "-DPLUGIN_THMPGSPATIALHASHING=OFF -DSOFA_FETCH_THMPGSPATIALHASHING=ON"
+    add-cmake-option "-DPLUGIN_VOLUMETRICRENDERING=ON"
 fi
 
 # Generate binaries?

diff --git a/scripts/main.sh b/scripts/main.sh
@@ -390,18 +390,18 @@ if in-array "run-unit-tests" "$BUILD_OPTIONS"; then
     dashboard-notify "tests_status=$tests_status"
     echo "$tests_status" > "$BUILD_DIR/unit-tests.status"
 
-    "$SCRIPT_DIR/unit-tests.sh" run "$BUILD_DIR" "$SRC_DIR"
-    "$SCRIPT_DIR/unit-tests.sh" print-summary "$BUILD_DIR" "$SRC_DIR"
+    "$SCRIPT_DIR/unit-tests.sh" run unit "$BUILD_DIR" "$SRC_DIR"
+    "$SCRIPT_DIR/unit-tests.sh" print-summary unit "$BUILD_DIR" "$SRC_DIR"
 
     tests_status="done" # TODO: handle script crash
     echo "$tests_status" > "$BUILD_DIR/unit-tests.status"
 
-    tests_suites=$("$SCRIPT_DIR/unit-tests.sh" count-test-suites $BUILD_DIR $SRC_DIR)
-    tests_total=$("$SCRIPT_DIR/unit-tests.sh" count-tests $BUILD_DIR $SRC_DIR)
-    tests_disabled=$("$SCRIPT_DIR/unit-tests.sh" count-disabled $BUILD_DIR $SRC_DIR)
-    tests_failures=$("$SCRIPT_DIR/unit-tests.sh" count-failures $BUILD_DIR $SRC_DIR)
-    tests_errors=$("$SCRIPT_DIR/unit-tests.sh" count-errors $BUILD_DIR $SRC_DIR)
-    tests_duration=$("$SCRIPT_DIR/unit-tests.sh" count-durations $BUILD_DIR $SRC_DIR)
+    tests_suites=$("$SCRIPT_DIR/unit-tests.sh" count-test-suites unit $BUILD_DIR $SRC_DIR)
+    tests_total=$("$SCRIPT_DIR/unit-tests.sh" count-tests unit $BUILD_DIR $SRC_DIR)
+    tests_disabled=$("$SCRIPT_DIR/unit-tests.sh" count-disabled unit $BUILD_DIR $SRC_DIR)
+    tests_failures=$("$SCRIPT_DIR/unit-tests.sh" count-failures unit $BUILD_DIR $SRC_DIR)
+    tests_errors=$("$SCRIPT_DIR/unit-tests.sh" count-errors unit $BUILD_DIR $SRC_DIR)
+    tests_duration=$("$SCRIPT_DIR/unit-tests.sh" count-durations unit $BUILD_DIR $SRC_DIR)
 
     tests_problems=$(( tests_failures + tests_errors ))
     github_message="${github_message} $tests_problems unit"
@@ -486,18 +486,18 @@ if in-array "run-regression-tests" "$BUILD_OPTIONS" && [ -n "$REGRESSION_DIR" ];
 
     references_dir="$REGRESSION_DIR/references"
 
-    "$SCRIPT_DIR/unit-tests.sh" run "$BUILD_DIR" "$SRC_DIR" "$references_dir"
-    "$SCRIPT_DIR/unit-tests.sh" print-summary "$BUILD_DIR" "$SRC_DIR" "$references_dir"
+    "$SCRIPT_DIR/unit-tests.sh" run regression "$BUILD_DIR" "$SRC_DIR"
+    "$SCRIPT_DIR/unit-tests.sh" print-summary regression "$BUILD_DIR" "$SRC_DIR"
 
     regressions_status="done" # TODO: handle script crash
     echo "$regressions_status" > "$BUILD_DIR/regression-tests.status"
 
-    regressions_suites=$("$SCRIPT_DIR/unit-tests.sh" count-test-suites $BUILD_DIR $SRC_DIR $references_dir)
-    regressions_total=$("$SCRIPT_DIR/unit-tests.sh" count-tests $BUILD_DIR $SRC_DIR $references_dir)
-    regressions_disabled=$("$SCRIPT_DIR/unit-tests.sh" count-disabled $BUILD_DIR $SRC_DIR $references_dir)
-    regressions_failures=$("$SCRIPT_DIR/unit-tests.sh" count-failures $BUILD_DIR $SRC_DIR $references_dir)
-    regressions_errors=$("$SCRIPT_DIR/unit-tests.sh" count-errors $BUILD_DIR $SRC_DIR $references_dir)
-    regressions_duration=$("$SCRIPT_DIR/unit-tests.sh" count-durations $BUILD_DIR $SRC_DIR $references_dir)
+    regressions_suites=$("$SCRIPT_DIR/unit-tests.sh" count-test-suites regression $BUILD_DIR $SRC_DIR )
+    regressions_total=$("$SCRIPT_DIR/unit-tests.sh" count-tests regression $BUILD_DIR $SRC_DIR )
+    regressions_disabled=$("$SCRIPT_DIR/unit-tests.sh" count-disabled regression $BUILD_DIR $SRC_DIR )
+    regressions_failures=$("$SCRIPT_DIR/unit-tests.sh" count-failures regression $BUILD_DIR $SRC_DIR )
+    regressions_errors=$("$SCRIPT_DIR/unit-tests.sh" count-errors regression $BUILD_DIR $SRC_DIR )
+    regressions_duration=$("$SCRIPT_DIR/unit-tests.sh" count-durations regression $BUILD_DIR $SRC_DIR )
 
     regressions_problems=$(( regressions_failures + regressions_errors ))
     github_message="${github_message}, $regressions_problems regression"

diff --git a/scripts/unit-tests.sh b/scripts/unit-tests.sh
@@ -9,28 +9,35 @@
 # Disable colored output to avoid dirtying the log
 export GTEST_COLOR=no
 export SOFA_COLOR_TERMINAL=no
+export PATH_RESET="$PATH"
 
 usage() {
-    echo "Usage: unit-tests.sh (run|print-summary) <build-dir> <src-dir> [references-dir]"
+    echo "Usage: unit-tests.sh (run|print-summary) (unit|regression) <build-dir> <src-dir>"
 }
 
 if [ "$#" -ge 3 ]; then
     SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
     . "$SCRIPT_DIR"/utils.sh
 
     command="$1"
-    build_dir="$(cd $2 && pwd)"
-    src_dir="$(cd $3 && pwd)"
+    build_dir="$(cd $3 && pwd)"
+    src_dir="$(cd $4 && pwd)"
     if vm-is-windows; then
-        src_dir="$(cd $3 && pwd -W)"
+        src_dir="$(cd $4 && pwd -W)"
     fi
+    test_name_min="$2"
     test_type="unit-tests"
-    if [ -n "$4" ]; then
+    if [ "$2" == "regression" ]; then
         test_type="regression-tests"
-        references_dir="$4"
-		if vm-is-windows; then
-			references_dir="$(cd $4 && pwd -W)"
-		fi
+
+        if vm-is-windows; then
+            # Avoid "libpython3X not found"
+            if [ -e "$VM_PYTHON3_EXECUTABLE" ]; then
+                pythonroot="$(dirname $VM_PYTHON3_EXECUTABLE)"
+                pythonroot="$(cd "$pythonroot" && pwd)"
+                export PATH="$pythonroot:$pythonroot/DLLs:$pythonroot/Lib:$PATH_RESET"
+            fi
+        fi
     fi
     output_dir="$test_type"
 else
@@ -53,11 +60,7 @@ fi
 # export SOFA_DATA_PATH="$src_dir:$src_dir/examples:$src_dir/share"
 export SOFA_ROOT="$build_dir"
 if [[ "$test_type" == "regression-tests" ]]; then
-    export REGRESSION_REFERENCES_DIR="$references_dir/examples|$references_dir/applications/plugins"
     export REGRESSION_SCENES_DIR="$src_dir/examples|$src_dir/applications/plugins"
-
-	echo $REGRESSION_REFERENCES_DIR
-	echo $REGRESSION_SCENES_DIR
 fi
 
 list-tests() {
@@ -91,7 +94,7 @@ list-tests() {
 }
 
 initialize-unit-tests() {
-    echo "Initializing unit testing."
+    echo "Initializing $test_name_min testing."
     rm -rf "$output_dir"
     mkdir -p "$output_dir/reports"
     list-tests | while read test; do
@@ -267,7 +270,7 @@ do-run-all-tests() {
 }
 
 run-all-tests() {
-    echo "Unit testing in progress..."
+    echo "${test_name_min^} testing in progress..."
 
     # Move SofaPython3 tests out of the list
     cat "$output_dir/${test_type}.txt" | grep "Bindings\." > "$output_dir/${test_type}.SofaPython3.txt"
@@ -400,3 +403,4 @@ elif [[ "$command" = print-summary ]]; then
 else
     usage
 fi
+export PATH="$PATH_RESET"