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

Fix the consequences of `set -e` 

And now the bash options, like `-x` and `-e`, are passed to sub-shells
using the positional parameter `$-`.
This commit is contained in:
Laurent Rineau 2017-07-18 12:02:55 +02:00
parent 07e34b2773
commit 1e1752c18e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/doc/scripts/compare_testsuites.sh
View File

@ -40,8 +40,8 @@ cd ..
echo "Output generated" echo "Output generated"
if ! [ -d "$DOC_REF" ]; then if ! [ -d "$DOC_REF" ]; then
echo "No reference given. Script is finished." echo "No reference given. Script is finished."
exit 2 exit 0
fi fi
#diff the output and the reference output, ignoring the differences in whitespaces #diff the output and the reference output, ignoring the differences in whitespaces
diff -u -N -w ./doc_data $DOC_REF > ./diff.txt diff -u -N -w ./doc_data $DOC_REF > ./diff.txt || true

4
Documentation/doc/scripts/test_doxygen_versions.sh
View File

@ -47,7 +47,7 @@ make -j$NB_CORES doc &> /dev/null
echo "done." echo "done."
cd ../ #scripts cd ../ #scripts
echo "Creating text files for diff...." echo "Creating text files for diff...."
bash compare_testsuites.sh $PWD/build_doc/doc_output 1> /dev/null bash -$- compare_testsuites.sh $PWD/build_doc/doc_output 1> /dev/null
mv ./doc_data ./doc_ref mv ./doc_data ./doc_ref
echo "done." echo "done."
@ -82,7 +82,7 @@ cd ../ #scripts
DOXYGEN_1=$($PATH_TO_1 --version) DOXYGEN_1=$($PATH_TO_1 --version)
DOXYGEN_2=$($PATH_TO_2 --version) DOXYGEN_2=$($PATH_TO_2 --version)
echo "Comparing results..." echo "Comparing results..."
bash ./compare_testsuites.sh $PWD/build_doc/doc_output $PWD/doc_ref 1> /dev/null bash -$- ./compare_testsuites.sh $PWD/build_doc/doc_output $PWD/doc_ref 1> /dev/null
echo "done." echo "done."
#add post-processing #add post-processing
cd ./build_doc cd ./build_doc