From b31ec4f345979a2fb705fb274f4bac9b7ab0e4fe Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Wed, 26 Jul 2017 08:30:32 +0000 Subject: test_suite: replace awk with perl to compute file contents and default to shunit2 in repo fixes https://github.com/genetics-statistics/GEMMA/issues/55 --- test/test_suite.sh | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/test/test_suite.sh b/test/test_suite.sh index ca13ff7..821c5bf 100755 --- a/test/test_suite.sh +++ b/test/test_suite.sh @@ -8,12 +8,11 @@ testCenteredRelatednessMatrixK() { assertEquals 0 $? grep "total computation time" < output/mouse_hs1940.log.txt assertEquals 0 $? - assertEquals "1940" `wc -l < output/mouse_hs1940.cXX.txt` - assertEquals "3763600" `wc -w < output/mouse_hs1940.cXX.txt` - # assertEquals "15f680c" `md5sum < output/mouse_hs1940.cXX.txt | head -c 7` - assertEquals "0.335" `head -c 5 output/mouse_hs1940.cXX.txt` - # FIXME: The following test fails in the Guix build system (https://github.com/genetics-statistics/GEMMA/issues/55) - assertEquals "24.9799" `awk '{s+=substr($1,0,6)}END{print s}' output/mouse_hs1940.cXX.txt` + outfn=output/mouse_hs1940.cXX.txt + assertEquals "1940" `wc -l < $outfn` + assertEquals "3763600" `wc -w < $outfn` + assertEquals "0.335" `head -c 5 $outfn` + assertEquals "24.9799" `perl -nle '$sum += substr($_,0,6) } END { print $sum' $outfn` } testUnivariateLinearMixedModel() { @@ -23,8 +22,9 @@ testUnivariateLinearMixedModel() { assertEquals 0 $? grep "total computation time" < output/mouse_hs1940_CD8_lmm.log.txt assertEquals 0 $? - assertEquals "118459" `wc -w < output/mouse_hs1940_CD8_lmm.assoc.txt` - assertEquals "92047" `awk '{s+=substr($1,0,6)}END{print s}' output/mouse_hs1940_CD8_lmm.assoc.txt` + outfn=output/mouse_hs1940_CD8_lmm.assoc.txt + assertEquals "118459" `wc -w < $outfn` + assertEquals "92047" `perl -nle '$sum += substr($_,0,6) } END { print $sum' $outfn` } testMultivariateLinearMixedModel() { @@ -37,19 +37,11 @@ testMultivariateLinearMixedModel() { outfn=output/mouse_hs1940_CD8MCH_lmm.assoc.txt assertEquals "139867" `wc -w < $outfn` - assertEquals "92079" `awk '{s+=substr($1,0,6)}END{print s}' $outfn` + assertEquals "92079" `perl -nle '$sum += substr($_,0,6) } END { print $sum' $outfn` } -shunit2=`which shunit2` -if [ -e "../contrib/shunit2/source/2.0/src/shell/shunit2" ]; then - echo try to run the locally installed shunit2 - . ../contrib/shunit2/source/2.0/src/shell/shunit2 -elif [ -e "shunit2-2.0.3/src/shell/shunit2" ]; then - echo try to run the older locally installed shunit2 +if [ -e shunit2-2.0.3/src/shell/shunit2 ]; then . shunit2-2.0.3/src/shell/shunit2 -elif [ -x "$shunit2" ]; then - echo run system shunit2 - . $shunit2 else echo "Can not find shunit2 - see INSTALL.md" fi -- cgit v1.2.3