Better deal with duration computation

Author: bakpaul

scripts/test.sh

@@ -71,15 +71,19 @@ fi
 # Unit tests
 if [[ "$TEST_TYPE" == *"UNIT"* ]]; then
 
+    SECONDS=0
+
     /bin/bash "$SCRIPT_DIR/unit-tests.sh" run unit "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
     /bin/bash "$SCRIPT_DIR/unit-tests.sh" print-summary unit "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
 
+    duration=$SECONDS
+
     echo "tests_suites=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-test-suites unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" > $RESULTS_DIR/unit-tests/unit-tests_results.txt
     echo "tests_total=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-tests unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
     echo "tests_disabled=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-disabled unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
     echo "tests_failures=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-failures unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
     echo "tests_errors=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-errors unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
-    echo "tests_duration=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-durations unit $BUILD_DIR $SRC_DIR $RESULTS_DIR)" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
+    echo "tests_duration=$duration" >> $RESULTS_DIR/unit-tests/unit-tests_results.txt
 
     python3 "$SCRIPT_DIR/exctractErrorFromXML.py" "$RESULTS_DIR/unit-tests/reports" "$RESULTS_DIR/unit-tests"
 
@@ -90,14 +94,19 @@ fi
 #############
 # Scene tests
 if [[ "$TEST_TYPE" == *"SCENE"* ]]; then
+
+    SECONDS=0
+
     /bin/bash "$SCRIPT_DIR/scene-tests.sh" run "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
     /bin/bash "$SCRIPT_DIR/scene-tests.sh" print-summary "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
 
+    duration=$SECONDS
+
     echo "scenes_total=$(/bin/bash $SCRIPT_DIR/scene-tests.sh count-tested-scenes $BUILD_DIR $SRC_DIR  $RESULTS_DIR)" >  $RESULTS_DIR/scene-tests/scene-tests_results.txt
     echo "scenes_successes=$(/bin/bash "$SCRIPT_DIR/scene-tests.sh" count-successes $BUILD_DIR $SRC_DIR  $RESULTS_DIR)" >>  $RESULTS_DIR/scene-tests/scene-tests_results.txt
     echo "scenes_errors=$(/bin/bash "$SCRIPT_DIR/scene-tests.sh" count-errors $BUILD_DIR $SRC_DIR  $RESULTS_DIR)" >>  $RESULTS_DIR/scene-tests/scene-tests_results.txt
     echo "scenes_crashes=$(/bin/bash "$SCRIPT_DIR/scene-tests.sh" count-crashes $BUILD_DIR $SRC_DIR  $RESULTS_DIR)" >>  $RESULTS_DIR/scene-tests/scene-tests_results.txt
-    echo "scenes_duration=$(/bin/bash "$SCRIPT_DIR/scene-tests.sh" count-durations $BUILD_DIR $SRC_DIR  $RESULTS_DIR)" >>  $RESULTS_DIR/scene-tests/scene-tests_results.txt
+    echo "scenes_duration=$duration" >>  $RESULTS_DIR/scene-tests/scene-tests_results.txt
 
     if [[ -f "$RESULTS_DIR/scene-tests/reports/crashes.txt" && "$(cat "$RESULTS_DIR/scene-tests/reports/crashes.txt")" != "" ]]; then
         cp $RESULTS_DIR/scene-tests/reports/crashes.txt $RESULTS_DIR/scene-tests_crashes
@@ -112,15 +121,20 @@ fi
 ##################
 # Regression tests
 if [[ "$TEST_TYPE" == *"REGRESSION"* ]]; then
+
+    SECONDS=0
+
     /bin/bash "$SCRIPT_DIR/unit-tests.sh" run regression "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
     /bin/bash "$SCRIPT_DIR/unit-tests.sh" print-summary regression "$BUILD_DIR" "$SRC_DIR" "$RESULTS_DIR" $VM_MAX_PARALLEL_TESTS
 
+    duration=$SECONDS
+
     echo "regressions_suites=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-test-suites regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" > $RESULTS_DIR/regression-tests/regression-tests_results.txt
     echo "regressions_total=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-tests regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
     echo "regressions_disabled=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-disabled regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
     echo "regressions_failures=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-failures regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
     echo "regressions_errors=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-errors regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
-    echo "regressions_duration=$(/bin/bash "$SCRIPT_DIR/unit-tests.sh" count-durations regression $BUILD_DIR $SRC_DIR $RESULTS_DIR )" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
+    echo "regressions_duration=$duration" >> $RESULTS_DIR/regression-tests/regression-tests_results.txt
 
     python3 "$SCRIPT_DIR/exctractErrorFromXML.py" "$RESULTS_DIR/regression-tests/reports" "$RESULTS_DIR/regression-tests"
 fi