songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also add it to the "r" reports

This commit is contained in:
Maxime Gimeno 2019-04-25 11:04:27 +02:00
parent 00c0e4e85a
commit 5b03adfbb7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Scripts/developer_scripts/run_testsuite_with_cmake
View File

@ -312,6 +312,10 @@ run_test_on_platform()
echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE" echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE"
grep -e "^-- USING " "${CGAL_BINARY_DIR}/installation.log" >> $RESULT_FILE grep -e "^-- USING " "${CGAL_BINARY_DIR}/installation.log" >> $RESULT_FILE
echo "------------" >> "$RESULT_FILE" echo "------------" >> "$RESULT_FILE"
#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/parse-ctest-dashboard-xml.py $CGAL_TESTER $PLATFORM python3 ${CGAL_DIR}/${TESTSUITE_DIR}test/parse-ctest-dashboard-xml.py $CGAL_TESTER $PLATFORM
for file in $(ls|grep _Tests); do for file in $(ls|grep _Tests); do
@ -324,15 +328,11 @@ run_test_on_platform()
cat "${CGAL_BINARY_DIR}/package_installation.log" >> "Installation/${TEST_REPORT}" cat "${CGAL_BINARY_DIR}/package_installation.log" >> "Installation/${TEST_REPORT}"
#call the python script to complete the results 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 python3 ${CGAL_DIR}/${TESTSUITE_DIR}test/get_deactivated_packages_info.py Installation/${TEST_REPORT} ${TEST_REPORT} results_${CGAL_TESTER}_${PLATFORM}.txt
rm -f $OUTPUT_FILE $OUTPUT_FILE.gz
if [ -n "${SCRIPTS_DIR}" ]; then if [ -n "${SCRIPTS_DIR}" ]; then
rm ../../../../../.scm-branch rm ../../../../../.scm-branch
fi fi
rm -f $OUTPUT_FILE $OUTPUT_FILE.gz
tar cf $OUTPUT_FILE results_${CGAL_TESTER}_${PLATFORM}.txt */"$TEST_REPORT" tar cf $OUTPUT_FILE results_${CGAL_TESTER}_${PLATFORM}.txt */"$TEST_REPORT"
echo echo
gzip -9f $OUTPUT_FILE gzip -9f $OUTPUT_FILE

3
Testsuite/test/get_deactivated_packages_info.py
View File

@ -54,6 +54,9 @@ with open(report_file, "rt") as test_report:
is_ignored=True is_ignored=True
os.mkdir(name) os.mkdir(name)
test_report=open("{dir}/{file}".format(dir=name, file=report_name), "w+") test_report=open("{dir}/{file}".format(dir=name, file=report_name), "w+")
print("""
{scm_branch}
""" .format(scm_branch=open("{}/../../../../../.scm-branch".format(os.getcwd()), 'r').read()),file=test_report)
else: else:
is_ignored=False is_ignored=False
test_report=open("{dir}/{file}".format(dir=name, file=report_name), "a+") test_report=open("{dir}/{file}".format(dir=name, file=report_name), "a+")