[Genabel-commits] r1280 - pkg/ProbABEL/tests

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2013-07-31 15:49:52 +0200 (Wed, 31 Jul 2013)
New Revision: 1280

Modified:
   pkg/ProbABEL/tests/check_dose_input.sh
   pkg/ProbABEL/tests/check_probabel.pl_chunk.sh
Log:
In the ProbABEL test scripts in the tests directory: 
- in both scripts: copy the trick to get the OK/FAILED status in the same columns from run_diff.sh in the examples directory. 
- in check_probabel.pl_chunck.sh: The fix of bug #2575 (-o option to probabel.pl) requires that we now specify the full beginning of the output file name. This commit fixes that in this script. 


Modified: pkg/ProbABEL/tests/check_dose_input.sh
===================================================================
--- pkg/ProbABEL/tests/check_dose_input.sh	2013-07-31 13:46:37 UTC (rev 1279)
+++ pkg/ProbABEL/tests/check_dose_input.sh	2013-07-31 13:49:52 UTC (rev 1280)
@@ -24,10 +24,11 @@
     -c 19 \
     -o height_base > /dev/null
 
-echo -n "  Verifying $outfile: "
+blanks="                                                          "
+echo -n "  Verifying "
 if diff $outfile $results/$outfile; then
-    echo -e "\t\tOK"
+    echo -e "${outfile}${blanks:${#outfile}} OK"
 else
-    echo -e "\t\tFAILED"
+    echo -e "${outfile}${blanks:${#outfile}} FAILED"
     exit 1
 fi

Modified: pkg/ProbABEL/tests/check_probabel.pl_chunk.sh
===================================================================
--- pkg/ProbABEL/tests/check_probabel.pl_chunk.sh	2013-07-31 13:46:37 UTC (rev 1279)
+++ pkg/ProbABEL/tests/check_probabel.pl_chunk.sh	2013-07-31 13:49:52 UTC (rev 1280)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # L.C. Karssen
 # This script is used to test whether probabel.pl works correctly when
 # input is cut up in chunks
@@ -109,11 +109,13 @@
 
     echo "Checking output using dosages $WithOrWithout chunks..."
     ./probabel.pl 1 2 linear $1 --additive height > /dev/null
-    echo -n "  Verifying $outfile: "
+
+    blanks="                                                          "
+    echo -n "  Verifying "
     if diff $outfile $results/$outfile; then
-        echo -e "\t\tOK"
+        echo -e "${outfile}${blanks:${#outfile}} OK"
     else
-        echo -e "\t\tFAILED"
+        echo -e "${outfile}${blanks:${#outfile}} FAILED"
         exit 1
     fi
 
@@ -123,13 +125,13 @@
     height_ngp2_add.out.txt"
 
     echo "Checking output using probabilities $WithOrWithout chunks..."
-    ./probabel.pl 1 2 linear $1 --allmodels height -o _ngp2 > /dev/null
+    ./probabel.pl 1 2 linear $1 --allmodels height -o height_ngp2 > /dev/null
     for file in $outfilelist; do
-        echo -n "  Verifying $file: "
+        echo -n "  Verifying "
         if diff $file $results/$file; then
-            echo -e "\t\tOK"
+            echo -e "${file}${blanks:${#file}} OK"
         else
-            echo -e "\t\tFAILED"
+            echo -e "${file}${blanks:${#file}} FAILED"
             exit 1
         fi
     done