Skip to content

Commit 6d8f9f9

Browse files
authored
feat: add automatic postprocessing of integratedTestsLogs. (#3509)
1 parent 7db0887 commit 6d8f9f9

File tree

4 files changed

+8
-98
lines changed

4 files changed

+8
-98
lines changed

scripts/ci_build_and_test_in_container.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,11 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
304304

305305
echo "Running integrated tests..."
306306
integratedTests/geos_ats.sh --baselineCacheDirectory /tmp/geos/baselines
307+
echo "Processing logs..."
308+
bin/geos_ats_process_tests_fails --directory integratedTests/TestResults &> integratedTests/TestResults/processedTestsLogs.txt
309+
echo "Packing logs..."
307310
tar -czf ${DATA_EXCHANGE_DIR}/test_logs_${DATA_BASENAME_WE}.tar.gz integratedTests/TestResults
308-
311+
309312
echo "Checking results..."
310313
bin/geos_ats_log_check integratedTests/TestResults/test_results.ini -y ${GEOS_SRC_DIR}/.integrated_tests.yaml &> $tempdir/log_check.txt
311314
cat $tempdir/log_check.txt
@@ -315,7 +318,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
315318
INTEGRATED_TEST_EXIT_STATUS=0
316319
else
317320
echo "IntegratedTests failed. Rebaseline is required."
318-
321+
319322
# Rebaseline and pack into an archive
320323
echo "Rebaselining..."
321324
integratedTests/geos_ats.sh -a rebaselinefailed

scripts/processIntegratedTestCheckFailures.py

Lines changed: 0 additions & 94 deletions
This file was deleted.

scripts/setupPythonEnvironment.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ declare -a LINK_SCRIPTS=("preprocess_xml"
2424
"geos_ats_log_check"
2525
"geos_ats_restart_check"
2626
"geos_ats_curve_check"
27+
"geos_ats_process_tests_fails"
2728
"mesh-doctor"
2829
"activate"
2930
"python")

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
219219
################################
220220
# Add python environment setup
221221
################################
222-
# message(WARNING "Temporarily changing the geosPythonBranch to bugfix/sherman/fixNumpyProd")
223-
# set(GEOS_PYTHON_PACKAGES_BRANCH "bugfix/sherman/fixNumpyProd" CACHE STRING "" FORCE)
222+
# message(WARNING "Temporarily changing the geosPythonBranch to cusini/addFailedTestsLogProcessing")
223+
# set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/addFailedTestsLogProcessing" CACHE STRING "" FORCE)
224224

225225

226226
if ( Python3_EXECUTABLE )

0 commit comments

Comments
 (0)