From 4e3195f12e94f8f71bc55bfadc336f978d5fb8e8 Mon Sep 17 00:00:00 2001 From: Fabian Gabel <fabian.gabel@tuhh.de> Date: Tue, 4 May 2021 16:11:03 +0200 Subject: [PATCH] reduce output to stdout of test_create_html --- bin/test_create_html.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/bin/test_create_html.sh b/bin/test_create_html.sh index bbe6a96..2ba7310 100755 --- a/bin/test_create_html.sh +++ b/bin/test_create_html.sh @@ -5,21 +5,23 @@ RESEARCH_TESTING=$RESEARCH_ROOT/testing/test_create_html # prepare place for logfiles mkdir -p $RESEARCH_ROOT/log +LOGFILE=$RESEARCH_ROOT/log/create_html.log +rm -rf $LOGFILE && touch $LOGFILE #BEGIN Test 1: test create_html for _research.html with no arguments T=1 -echo "##################################################" +#echo "##################################################" echo "Test 1: create_html with no arguments" -echo "##################################################" +#echo "##################################################" # preparation REF_FILE=$RESEARCH_TESTING/ref_fgabel_research.html rm -rf $RESEARCH_TESTING/build cd $RESEARCH_TESTING # run test -$RESEARCH_ROOT/bin/create_html.sh +$RESEARCH_ROOT/bin/create_html.sh >> $LOGFILE 2>&1 # check results DIFF=$(diff $REF_FILE $RESEARCH_TESTING/build/fgabel_research.html ) -echo "--------------------------------------------------" +#echo "--------------------------------------------------" if [ "$DIFF" == "" ] && [ -f "$RESEARCH_TESTING/build/fgabel_research.html" ] then echo "Test $T: PASSED." @@ -32,20 +34,20 @@ fi #BEGIN Test 2: test create_html for _research.html with build argument T=2 -echo "##################################################" +#echo "##################################################" echo "Test $T: create_html with build argument" -echo "##################################################" +#echo "##################################################" # preparation RESEARCH_BUILD=$RESEARCH_TESTING/build REF_FILE=$RESEARCH_TESTING/ref_fgabel_research.html rm -rf $RESEARCH_BUILD mkdir -p $RESEARCH_BUILD -cp -v $RESEARCH_TESTING/*.md $RESEARCH_BUILD +cp $RESEARCH_TESTING/*.md $RESEARCH_BUILD # run test -$RESEARCH_ROOT/bin/create_html.sh $RESEARCH_BUILD +$RESEARCH_ROOT/bin/create_html.sh $RESEARCH_BUILD >> $LOGFILE 2>&1 # check results DIFF=$(diff $REF_FILE $RESEARCH_TESTING/fgabel_research.html) -echo "--------------------------------------------------" +#echo "--------------------------------------------------" if [ "$DIFF" == "" ] && [ -f "$RESEARCH_BUILD/fgabel_research.html" ] then echo "Test $T: PASSED." @@ -58,18 +60,18 @@ fi #BEGIN Test 3: test create_html for _research.html with build and topics argument T=3 -echo "##################################################" -echo "Test $T: create_html with build argument" -echo "##################################################" +#echo "##################################################" +echo "Test $T: create_html with build and topics argument" +#echo "##################################################" # preparation RESEARCH_BUILD=$RESEARCH_TESTING/build RESEARCH_TOPICS=$RESEARCH_BUILD/topics REF_FILE=$RESEARCH_TESTING/ref_fgabel_research.html rm -rf $RESEARCH_BUILD mkdir -p $RESEARCH_BUILD && mkdir -p $RESEARCH_TOPICS -cp -v $RESEARCH_TESTING/*.md $RESEARCH_TOPICS +cp $RESEARCH_TESTING/*.md $RESEARCH_TOPICS # run test -$RESEARCH_ROOT/bin/create_html.sh $RESEARCH_BUILD $RESEARCH_TOPICS +$RESEARCH_ROOT/bin/create_html.sh $RESEARCH_BUILD $RESEARCH_TOPICS >> $LOGFILE 2>&1 # check if output exists and results coincide with reference file DIFF=$(diff $REF_FILE $RESEARCH_BUILD/fgabel_research.html) if [ "$DIFF" == "" ] && [ -f "$RESEARCH_BUILD/fgabel_research.html" ] @@ -86,4 +88,3 @@ fi echo "--------------------------------------------------" echo "ALL $T tests in $0 PASSED." exit 0 - -- GitLab