diff --git a/Scripts/developer_scripts/run_testsuite_with_cmake b/Scripts/developer_scripts/run_testsuite_with_cmake index 976a9d5b5ee..262bb9baf81 100644 --- a/Scripts/developer_scripts/run_testsuite_with_cmake +++ b/Scripts/developer_scripts/run_testsuite_with_cmake @@ -324,8 +324,14 @@ run_test_on_platform() cat "${CGAL_BINARY_DIR}/package_installation.log" >> "Installation/${TEST_REPORT}" #call the python script to complete the results report. + #if git branch, create empty scm file for python script + if [ -n "${SCRIPTS_DIR}" ]; then + touch ../../../../../.scm-branch + fi python3 ${CGAL_DIR}/${TESTSUITE_DIR}test/get_deactivated_packages_info.py Installation/${TEST_REPORT} ${TEST_REPORT} results_${CGAL_TESTER}_${PLATFORM}.txt - + if [ -n "${SCRIPTS_DIR}" ]; then + rm ../../../../../.scm-branch + fi rm -f $OUTPUT_FILE $OUTPUT_FILE.gz tar cf $OUTPUT_FILE results_${CGAL_TESTER}_${PLATFORM}.txt */"$TEST_REPORT" echo diff --git a/Testsuite/test/parse-ctest-dashboard-xml.py b/Testsuite/test/parse-ctest-dashboard-xml.py index b197db9997c..6258d56babe 100644 --- a/Testsuite/test/parse-ctest-dashboard-xml.py +++ b/Testsuite/test/parse-ctest-dashboard-xml.py @@ -100,11 +100,13 @@ for label, tests in tests_per_label.items(): tester=tester_name, platform=platform_name), 'w') as label_report: print(""" +{scm_branch} ------------------------------------------------------------------ - Error output from platform {platform} ------------------------------------------------------------------ {error_txt} -""" .format(platform=platform_name, +""" .format(scm_branch=open("{}/../../../../../.scm-branch".format(os.getcwd()), 'r').read(), + platform=platform_name, error_txt=open("{}/error.txt".format(label), 'r').read()), file=label_report) for t in tests: filename="{}/ProgramOutput.{}".format(label, t['Name'])