Merge branch 'develop' into pt/poromech-init-again

GEOS-DEV · Jan 13, 2025 · e266546 · e266546
2 parents 8976830 + fd36d2a
commit e266546
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 98 deletions.
diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh
@@ -304,8 +304,11 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
 
   echo "Running integrated tests..."
   integratedTests/geos_ats.sh --baselineCacheDirectory /tmp/geos/baselines
+  echo "Processing logs..."
+  bin/geos_ats_process_tests_fails --directory integratedTests/TestResults &> integratedTests/TestResults/processedTestsLogs.txt
+  echo "Packing logs..."
   tar -czf ${DATA_EXCHANGE_DIR}/test_logs_${DATA_BASENAME_WE}.tar.gz integratedTests/TestResults
-
+  
   echo "Checking results..."
   bin/geos_ats_log_check integratedTests/TestResults/test_results.ini -y ${GEOS_SRC_DIR}/.integrated_tests.yaml &> $tempdir/log_check.txt
   cat $tempdir/log_check.txt
@@ -315,7 +318,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
     INTEGRATED_TEST_EXIT_STATUS=0
   else
     echo "IntegratedTests failed. Rebaseline is required."
-
+   
     # Rebaseline and pack into an archive
     echo "Rebaselining..."
     integratedTests/geos_ats.sh -a rebaselinefailed

diff --git a/scripts/processIntegratedTestCheckFailures.py b/scripts/processIntegratedTestCheckFailures.py
diff --git a/scripts/setupPythonEnvironment.bash b/scripts/setupPythonEnvironment.bash
@@ -24,6 +24,7 @@ declare -a LINK_SCRIPTS=("preprocess_xml"
                          "geos_ats_log_check"
                          "geos_ats_restart_check"
                          "geos_ats_curve_check"
+                         "geos_ats_process_tests_fails"
                          "mesh-doctor"
                          "activate"
                          "python")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -219,8 +219,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
 ################################
 # Add python environment setup
 ################################
-# message(WARNING "Temporarily changing the geosPythonBranch to bugfix/sherman/fixNumpyProd")
-# set(GEOS_PYTHON_PACKAGES_BRANCH "bugfix/sherman/fixNumpyProd" CACHE STRING "" FORCE)
+# message(WARNING "Temporarily changing the geosPythonBranch to cusini/addFailedTestsLogProcessing")
+# set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/addFailedTestsLogProcessing" CACHE STRING "" FORCE)
 
 
 if ( Python3_EXECUTABLE )