From dfd851b38f5faa0434b01b4bf2d427dec2a5fed8 Mon Sep 17 00:00:00 2001 From: heister Date: Fri, 8 Feb 2013 16:59:01 +0000 Subject: [PATCH] extract script to benchmark the current revision git-svn-id: https://svn.dealii.org/trunk@28280 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/benchmarks/bench.sh | 35 ++------------------------------ tests/benchmarks/benchrev.sh | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 tests/benchmarks/benchrev.sh diff --git a/tests/benchmarks/bench.sh b/tests/benchmarks/bench.sh index 950ca4cbf3..d6c465a5a6 100644 --- a/tests/benchmarks/bench.sh +++ b/tests/benchmarks/bench.sh @@ -1,11 +1,7 @@ #!/bin/bash -source testlist.sh - PREVREVISION="`svn info deal.II | grep Revision | sed s/Revision://`" HEADREVISION="`svn info https://svn.dealii.org/trunk/deal.II | grep Revision | sed s/Revision://`" -MAKECMD="nice make -j10" -export MAKECMD echo "previous $PREVREVISION" echo "HEAD: $HEADREVISION" @@ -23,36 +19,9 @@ while [ $PREVREVISION -lt $HEADREVISION ] ; do continue ; fi + cd .. PREVREVISION=$NEXTREVISION - - echo "configure" - ./configure --disable-threads --with-petsc=no || exit 2 - echo "compiling" - $MAKECMD optimized || exit 3 - - cd .. - - for test in $TESTS ; do - cd $test - echo "** working on $test" - make clean >/dev/null - echo -n "" > temp.txt - for a in {1..5}; do - echo "*" >> temp.txt - make run | grep "|" >> temp.txt - done - ./../gettimes/gettimes > names.test - if [[ -s names.test ]] ; then - words=`wc -w names.test | cut -f1 -d' '` - if [ "$words" -gt "0" ] ; then - cp names.test ../names.$test - fi ; - rm -rf names.test - fi ; - ./../gettimes/gettimes $NEXTREVISION >>../datatable.$test - cd .. - - done + . benchrev.sh done diff --git a/tests/benchmarks/benchrev.sh b/tests/benchmarks/benchrev.sh new file mode 100644 index 0000000000..2e18255552 --- /dev/null +++ b/tests/benchmarks/benchrev.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +source testlist.sh + +PREVREVISION="`svn info deal.II | grep Revision | sed s/Revision://`" +MAKECMD="nice make -j10" +export MAKECMD + +echo "testing $PREVREVISION" + +cd deal.II + echo "configure" + ./configure --disable-threads --with-petsc=no || exit 2 + echo "compiling" + $MAKECMD optimized || exit 3 + + cd .. + + for test in $TESTS ; do + cd $test + echo "** working on $test" + make clean >/dev/null + echo -n "" > temp.txt + for a in {1..5}; do + echo "*" >> temp.txt + make run | grep "|" >> temp.txt + done + ./../gettimes/gettimes > names.test + if [[ -s names.test ]] ; then + words=`wc -w names.test | cut -f1 -d' '` + if [ "$words" -gt "0" ] ; then + cp names.test ../names.$test + fi ; + rm -rf names.test + fi ; + ./../gettimes/gettimes $NEXTREVISION >>../datatable.$test + cd .. + + done -- 2.39.5