Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / run_tests.sh.in

diff --git a/run_tests.sh.in b/run_tests.sh.in
index 35e24d794ee9825851ec1a6c3d4030a016d42f88..1cb8e170adc361f5618a7a1957de934ad9173871 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -10,14 +10,17 @@ abs_top_srcdir=@abs_top_srcdir@
 # Absolute path to the top of the build directory
 abs_top_builddir=@abs_top_builddir@
 
-# Where to find my swig generated shared library
-mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
+# current QA srcdir
+export srcdir=$3
+
+# Where to find my C++ and swig generated shared libraries
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/lib:$2/lib/.libs:$2/swig:$2/swig/.libs
 
 # Where to find my swig generated python module
 mysrcdir=$1/src:$1/src/lib
 
 # Where to find my hand written python modules
-mypydir=$1/src:$1/src/python
+mypydir=$1/src:$1/src/python:$1/python
 
 # Where to find core's swig generated shared libraries,
 # and hand generated swig glue
@@ -53,8 +56,8 @@ fi
 PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$PYTHONPATH"
 export PYTHONPATH
 
-# Where to find omnithread library files
-gromnidir=@omnithread_LIBDIRPATH@
+# Where to find gruel library files
+grueldir=@gruel_LIBDIRPATH@
 
 # Where to find gnuradio core's library files
 grcoredir=@gnuradio_core_LIBDIRPATH@
@@ -62,7 +65,7 @@ grcoredir=@gnuradio_core_LIBDIRPATH@
 # Construct search path for python modules
 # Check each one to make sure it's not "" before adding
 grlibdir=""
-for dir in $gromnidir $grcoredir
+for dir in $grcoredir $grueldir
 do
     if [ "$dir" != "" ]
     then
@@ -135,8 +138,15 @@ export GR_DONT_LOAD_PREFS
 ok=yes
 for file in $3/qa_*.py
 do
-  if ! @PYTHON@ $file
+  # echo $file
+  @PYTHON@ $file
+  r=$?
+  if [ $r -ne 0 ]
   then
+    if [ $r -ge 128 ]          # killed by a signal
+    then
+      exit $r
+    fi
     ok=no
   fi  
 done