update testsuite script to last doxygen version

This commit is contained in:
Sébastien Loriot 2023-05-12 19:44:58 +02:00
parent cb11c8a673
commit d23fdd85bf
3 changed files with 28 additions and 28 deletions

View File

@ -1,22 +1,22 @@
#!/bin/bash
if [ "$1" == '--help' ]; then
echo "Usage: $0 <doxygen 1.8.4> <doxygen 1.8.13> [publish_dir]"
echo "Compares the output of doxygen 1.8.13 and doxygen master to the one from doxygen 1.8.4, of this CGAL version, "
echo "Usage: $0 <doxygen 1.8.13> <doxygen 1.9.6> [publish_dir]"
echo "Compares the output of doxygen 1.9.6 and doxygen master to the one from doxygen 1.8.13, of this CGAL version, "
echo "publish_dir is the path to the dir where the testsuite results are kept"
echo "$0 must be called from doc/scripts"
exit 0
fi
mkdir -p doc_1_8_4
mkdir -p doc_1_8_13
mkdir -p doc_1_9_6
mkdir -p doc_master
PATH_TO_1_8_4="$1"
PATH_TO_1_8_13="$2"
PATH_TO_1_8_13="$1"
PATH_TO_1_9_6="$2"
PUBLISH_DIR="$3"
DOXYGEN_1=$($PATH_TO_1_8_4 --version)
DOXYGEN_2=$($PATH_TO_1_8_13 --version)
DOXYGEN_1=$($PATH_TO_1_8_13 --version)
DOXYGEN_2=$($PATH_TO_1_9_6 --version)
DO_COMPARE=TRUE
PATH_TO_SCRIPTS=${PWD}
@ -52,17 +52,17 @@ cd $PATH_TO_SCRIPTS #scripts
PATH_TO_MASTER="$PWD/doxygen_master/build/bin/doxygen"
echo "done."
echo "comparing versions 1.8.4 and 1.8.13"
bash -$- test_doxygen_versions.sh $PATH_TO_1_8_4 $PATH_TO_1_8_13 $PWD/doc_1_8_4 $PWD/doc_1_8_13 $PUBLISH_DIR
if [ ! -d $PWD/doc_1_8_13/doc_log ]; then
echo "comparing versions 1.8.13 and 1.9.6"
bash -$- test_doxygen_versions.sh $PATH_TO_1_8_13 $PATH_TO_1_9_6 $PWD/doc_1_8_13 $PWD/doc_1_9_6 $PUBLISH_DIR
if [ ! -d $PWD/doc_1_9_6/doc_log ]; then
echo "NO DOC LOGS."
exit 1
fi
mv diff.txt diff1.txt
echo "comparing versions 1.8.4 and master"
echo "comparing versions 1.8.13 and master"
if [ "$DO_COMPARE" = "TRUE" ]; then
bash -$- test_doxygen_versions.sh $PATH_TO_1_8_4 $PATH_TO_MASTER $PWD/doc_1_8_4 $PWD/doc_master $PUBLISH_DIR
bash -$- test_doxygen_versions.sh $PATH_TO_1_8_13 $PATH_TO_MASTER $PWD/doc_1_8_13 $PWD/doc_master $PUBLISH_DIR
fi
if [ $? -ne 0 ] || [ "$DO_COMPARE" = "FALSE" ]; then
DO_COMPARE=FALSE
@ -74,19 +74,19 @@ fi
#update overview
CGAL_NAME=$(cat cgal_version)
if [ "$DO_COMPARE" = "TRUE" ]; then
python3 ${PWD}/testsuite.py --output-dir1 $PWD/doc_1_8_4/doc_output/ --output-dir2 $PWD/doc_1_8_13/doc_output/ --doc-log-dir1 $PWD/doc_1_8_4/doc_log/ \
--doc-log-dir2 $PWD/doc_1_8_13/doc_log/ --doc-log-dir-master $PWD/doc_master/doc_log/ \
python3 ${PWD}/testsuite.py --output-dir1 $PWD/doc_1_8_13/doc_output/ --output-dir2 $PWD/doc_1_9_6/doc_output/ --doc-log-dir1 $PWD/doc_1_8_13/doc_log/ \
--doc-log-dir2 $PWD/doc_1_9_6/doc_log/ --doc-log-dir-master $PWD/doc_master/doc_log/ \
--publish $PUBLISH_DIR --diff1 $PWD/diff1.txt --diff2 $PWD/diff2.txt --master-dir $PWD/doc_master/doc_output/ \
--cgal-version "$CGAL_NAME" --do-copy-results --version-to-keep 10 --doxygen-version1 "$DOXYGEN_1" --doxygen-version2 "$DOXYGEN_2" --master-describe "$MASTER_DESCRIBE"
else
echo "NO MASTER"
python3 ${PWD}/testsuite.py --output-dir1 $PWD/doc_1_8_4/doc_output/ --output-dir2 $PWD/doc_1_8_13/doc_output/ --doc-log-dir1 $PWD/doc_1_8_4/doc_log/ \
--doc-log-dir2 $PWD/doc_1_8_13/doc_log/ --doc-log-dir-master $PWD/doc_master/ \
python3 ${PWD}/testsuite.py --output-dir1 $PWD/doc_1_8_13/doc_output/ --output-dir2 $PWD/doc_1_9_6/doc_output/ --doc-log-dir1 $PWD/doc_1_8_13/doc_log/ \
--doc-log-dir2 $PWD/doc_1_9_6/doc_log/ --doc-log-dir-master $PWD/doc_master/ \
--publish $PUBLISH_DIR --diff1 $PWD/diff1.txt \
--cgal-version "$CGAL_NAME" --do-copy-results --version-to-keep 10 --doxygen-version1 "$DOXYGEN_1" --doxygen-version2 "$DOXYGEN_2"
fi
#clean-up
rm -rf ./doc_1_8_4 ./doc_1_8_13 ./doc_master #./doxygen_master
rm -rf ./doc_1_8_13 ./doc_1_9_6 ./doc_master #./doxygen_master
rm ./diff1.txt ./cgal_version
if [ -f ./diff2.txt ]; then
rm ./diff2.txt

View File

@ -74,7 +74,7 @@ body {color: black; background-color: #C0C0D0; font-family: sans-serif;}
</head><body>
<h1 id="maintitle">Doxygen Manual Results</h1>'''
page_footer='''<table border="1" cellspacing="2" cellpadding="5" class="test-results">
<tr><td/><th colspan="3">Doxygen 1.8.4</th><th colspan="3">Doxygen 1.8.13(official)</th><th colspan="3">Doxygen master</th></tr>
<tr><td/><th colspan="3">Doxygen 1.8.13(patched)</th><th colspan="3">Doxygen 1.9.6(patched)</th><th colspan="3">Doxygen master</th></tr>
<tr>
<th>Package Name</th>
<th>Logs </th>
@ -267,10 +267,10 @@ body {color: black; background-color: #C0C0D0; font-family: sans-serif;}
<html><head><title>Manual Testsuite Overview</title></head>
<body><h1>Overviewpage of the Doxygen Manual Testsuite</h1>
<table border="1" cellspacing="2" cellpadding="5" id="revisions" class="rev-table">
<tr><td/><td/><th colspan="2">Doxygen 1.8.4</th><th colspan="2">Doxygen 1.8.13</th><th colspan="2">Doxygen master</th><td/><td/></tr>
<tr><td/><td/><th colspan="2">Doxygen 1.8.13</th><th colspan="2">Doxygen 1.9.6</th><th colspan="2">Doxygen master</th><td/><td/></tr>
<tr><th>Revision</th><th>Date</th><th>Warnings</th>
<th>Errors</th><th>Warnings </th><th>Errors</th><th>Warnings </th><th>Errors </th>
<th>Diff with doxygen master</th><th>Diff with doxygen 1.8.13</th></tr></table></body>''')
<th>Diff with doxygen master</th><th>Diff with doxygen 1.9.6</th></tr></table></body>''')
args_list=''
for arg in sys.argv[0:]:
args_list+=arg+' '

View File

@ -61,7 +61,7 @@ cd "${CGAL_RELEASE_ID}"
PATH=/home/cgal-testsuite/local/bin:$PATH
export PATH
cd "$PWD/doc/scripts"
bash -$- ./process_doc.sh /home/cgal-testsuite/local/bin/doxygen /home/mgimeno/bin/doxygen /srv/CGAL/www/Members/Manual_doxygen_test
bash -$- ./process_doc.sh /home/cgal-testsuite/bin/doxygen_1_8_13 /home/cgal-testsuite/bin/doxygen_1_9_6 /srv/CGAL/www/Members/Manual_doxygen_test
if head -2 ../../.scm-branch | grep -q cgal/master; then
rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output2/" /srv/CGAL/www/doc/master/
fi