[med-svn] [examl] 01/01: Fix wrapper script and add test case

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository examl.

commit 2287f00788ca2c8a5c15a7f97d2d07f0acd8c4bd
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 17 14:49:45 2017 +0100

    Fix wrapper script and add test case
---
 debian/bin/examl           | 6 +++---
 debian/tests/run-unit-test | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/bin/examl b/debian/bin/examl
index 947d219..35ac023 100755
--- a/debian/bin/examl
+++ b/debian/bin/examl
@@ -12,7 +12,7 @@ NPROC=`nproc`
 if echo "$@" | grep -q -- -np ; then
   NP=`echo "$@" | sed 's/^.* *-np *\([0-9]\+\) *.*/\1/'`
   echo "Run MPI on $NP processors as requested"
-  CMDARGS=`echo "$@" | sed 's/\(^.* \)-np *[0-9]\+\( .*\)/\1\2/'`
+  CMDARGS=`echo "$@" | sed 's/\(^.* *\)-np *[0-9]\+\( *.*\)/\1\2/'`
 else
   NP=$((NPROC/2)) # leave 50% processors for other jobs - if you want to force more just use -np option
   if [ $NP -eq 1 ] ; then
@@ -24,8 +24,8 @@ fi
 
 if grep -q avx /proc/cpuinfo; then
     echo "Use $EXE with AVX support and $NP processors"
-    mpirun -np $NP ${EXAMLDIR}/${EXE}-AVX "CMDARGS"
+    mpirun -np $NP ${EXAMLDIR}/${EXE}-AVX $CMDARGS
 else
     echo "Use $EXE without AVX support and $NP processors"
-    mpirun -np $NP ${EXAMLDIR}/${EXE} "CMDARGS"
+    mpirun -np $NP ${EXAMLDIR}/${EXE} $CMDARGS
 fi
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 194a3f4..9e273ed 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -14,5 +14,8 @@ cd $ADTTMP
 
 gunzip -r *
 
+set -x
 parse-examl -s testData/49 -m DNA -n 49.unpartitioned
 parse-examl -s testData/49 -q testData/49.model -m DNA -n 49.partitioned
+
+examl -np 2 -t testData/49.tree -m GAMMA -s 49.unpartitioned.binary -n T1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/examl.git