From 6b5a0200e260382d61e31dbf016719644163f73b Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sun, 27 Aug 2006 18:51:43 +0000 Subject: Implements ticket:3 and fixes ticket:42. The common functionality of run_tests.in for Python QA has been extracted into run_tests.sh in the top-level and the individual run_tests just invoke that with the right path parameters. Also fixed Cygwin 'make check' bug by adding fix by Don Ward. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3440 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/python/gnuradio/gr/run_tests.in | 43 +++++++---------------- 1 file changed, 12 insertions(+), 31 deletions(-) (limited to 'gnuradio-core/src') diff --git a/gnuradio-core/src/python/gnuradio/gr/run_tests.in b/gnuradio-core/src/python/gnuradio/gr/run_tests.in index 87d0afdaf..107efe728 100755 --- a/gnuradio-core/src/python/gnuradio/gr/run_tests.in +++ b/gnuradio-core/src/python/gnuradio/gr/run_tests.in @@ -1,33 +1,14 @@ #!/bin/sh -swigbld=@abs_top_builddir@/gnuradio-core/src/lib/swig -swigsrc=@abs_top_srcdir@/gnuradio-core/src/lib/swig -py=@abs_top_srcdir@/gnuradio-core/src/python - -PYTHONPATH="$swigbld:$swigbld/.libs:$swigsrc:$py" -export PYTHONPATH - -# for OS/X -DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs" -export DYLD_LIBRARY_PATH - -# Don't load user or system prefs -GR_DONT_LOAD_PREFS=1 -export GR_DONT_LOAD_PREFS - -ok=yes -for file in @srcdir@/qa_*.py -do - echo $file - if ! $file - then - ok=no - fi -done - -if [ $ok = yes ] -then - exit 0 -else - exit 1 -fi +# 1st parameter is absolute path to component source directory +# 2nd parameter is absolute path to component build directory +# 3rd parameter is path to Python QA directory + +# Note: calling master run_tests.sh in gnuradio core is not strictly +# correct, as it will result in a partially bogus PYTHONPATH, but it +# does make the correct paths in the second half so all is well. + +@top_builddir@/run_tests.sh \ + @abs_top_srcdir@/gnuradio-core \ + @abs_top_builddir@/gnuradio-core \ + @srcdir@ -- cgit