[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3440 - in gnuradio/trunk: . gnuradio-core/src/python/
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3440 - in gnuradio/trunk: . gnuradio-core/src/python/gnuradio/gr gr-atsc/src/python gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-error-correcting-codes/src/python gr-ezdop/src/python gr-gsm-fr-vocoder/src/python gr-radar/src/python gr-radio-astronomy/src/python gr-trellis/src/python gr-usrp/src gr-video-sdl/src |
|
Date: |
Sun, 27 Aug 2006 12:51:43 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-27 12:51:43 -0600 (Sun, 27 Aug 2006)
New Revision: 3440
Added:
gnuradio/trunk/run_tests.sh.in
Modified:
gnuradio/trunk/
gnuradio/trunk/Makefile.am
gnuradio/trunk/configure.ac
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/run_tests.in
gnuradio/trunk/gr-atsc/src/python/run_tests.in
gnuradio/trunk/gr-audio-alsa/src/run_tests.in
gnuradio/trunk/gr-audio-jack/src/run_tests.in
gnuradio/trunk/gr-audio-oss/src/run_tests.in
gnuradio/trunk/gr-audio-osx/src/run_tests.in
gnuradio/trunk/gr-audio-portaudio/src/run_tests.in
gnuradio/trunk/gr-audio-windows/src/run_tests.in
gnuradio/trunk/gr-comedi/src/run_tests.in
gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
gnuradio/trunk/gr-ezdop/src/python/run_tests.in
gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in
gnuradio/trunk/gr-radar/src/python/run_tests.in
gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in
gnuradio/trunk/gr-trellis/src/python/run_tests.in
gnuradio/trunk/gr-usrp/src/run_tests.in
gnuradio/trunk/gr-video-sdl/src/run_tests.in
Log:
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.
Property changes on: gnuradio/trunk
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile
build
+ configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile
build
run_tests.sh
Modified: gnuradio/trunk/Makefile.am
===================================================================
--- gnuradio/trunk/Makefile.am 2006-08-27 18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/Makefile.am 2006-08-27 18:51:43 UTC (rev 3440)
@@ -21,10 +21,11 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- bootstrap \
- configure \
- config.h.in
+EXTRA_DIST = \
+ bootstrap \
+ configure \
+ config.h.in \
+ run_tests.sh.in
SUBDIRS = @build_dirs@
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2006-08-27 18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/configure.ac 2006-08-27 18:51:43 UTC (rev 3440)
@@ -189,9 +189,13 @@
AC_CONFIG_FILES([\
Makefile \
+ run_tests.sh
config/Makefile
])
+dnl run_tests.sh is created from run_tests.in.sh. Make it executable.
+AC_CONFIG_COMMANDS([run_tests_build], [chmod +x run_tests.sh])
+
AC_OUTPUT
echo
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/run_tests.in
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 18:51:43 UTC (rev 3440)
@@ -1,33 +1,14 @@
#!/bin/sh
address@hidden@/gnuradio-core/src/lib/swig
address@hidden@/gnuradio-core/src/lib/swig
address@hidden@/gnuradio-core/src/python
+# 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
-PYTHONPATH="$swigbld:$swigbld/.libs:$swigsrc:$py"
-export PYTHONPATH
+# 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.
-# 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
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gnuradio-core \
+ @abs_top_builddir@/gnuradio-core \
+ @srcdir@
Modified: gnuradio/trunk/gr-atsc/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-atsc/src/python/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-atsc/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-atsc/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-atsc/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-atsc \
+ @abs_top_builddir@/gr-atsc \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-alsa/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-alsa/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-alsa/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-alsa/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-alsa/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-alsa \
+ @abs_top_builddir@/gr-audio-alsa \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-jack/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-jack/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-jack/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-jack/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-jack/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-jack \
+ @abs_top_builddir@/gr-audio-jack \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-oss/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-oss/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-oss/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-oss/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-oss/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-oss \
+ @abs_top_builddir@/gr-audio-oss \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-osx/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-osx/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,53 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-osx/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-osx/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-osx/src
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-osx \
+ @abs_top_builddir@/gr-audio-osx \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-portaudio/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-portaudio/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-portaudio/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-portaudio/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-portaudio/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-portaudio \
+ @abs_top_builddir@/gr-audio-portaudio \
+ @srcdir@
Modified: gnuradio/trunk/gr-audio-windows/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-audio-windows/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-windows/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-windows/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-windows/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-windows \
+ @abs_top_builddir@/gr-audio-windows \
+ @srcdir@
Modified: gnuradio/trunk/gr-comedi/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-comedi/src/run_tests.in 2006-08-27 18:10:05 UTC (rev
3439)
+++ gnuradio/trunk/gr-comedi/src/run_tests.in 2006-08-27 18:51:43 UTC (rev
3440)
@@ -1,49 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-comedi/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-comedi/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-comedi/src
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-comedi \
+ @abs_top_builddir@/gr-comedi \
+ @srcdir@
Modified: gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 18:51:43 UTC (rev 3440)
@@ -23,7 +23,7 @@
EXTRA_DIST = run_tests.in
-# Disable qa checks due to non-standard directory structure (eb)
+# Disabled until fix for finding an audio module in build tree
# TESTS = run_tests
noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py
Modified: gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 18:51:43 UTC (rev 3440)
@@ -1,49 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-error-correcting-codes/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-error-correcting-codes/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-error-correcting-codes/src/python
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-error-correcting-codes \
+ @abs_top_builddir@/gr-error-correcting-codes \
+ @srcdir@
Modified: gnuradio/trunk/gr-ezdop/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-ezdop/src/python/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-ezdop/src/python/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-ezdop/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-ezdop/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-ezdop/src/lib
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
address@hidden@/gnuradio-core/src/lib/.libs:@abs_top_builddir@/ezdop/src/host/ezdop/.libs
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-ezdop \
+ @abs_top_builddir@/gr-ezdop \
+ @srcdir@
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in 2006-08-27
18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in 2006-08-27
18:51:43 UTC (rev 3440)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-gsm-fr-vocoder/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-gsm-fr-vocoder/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-gsm-fr-vocoder/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-gsm-fr-vocoder \
+ @abs_top_builddir@/gr-gsm-fr-vocoder \
+ @srcdir@
Modified: gnuradio/trunk/gr-radar/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-radar/src/python/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-radar/src/python/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@gr-radar/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-radar/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-radar/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-radar \
+ @abs_top_builddir@/gr-radar \
+ @srcdir@
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in 2006-08-27
18:10:05 UTC (rev 3439)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in 2006-08-27
18:51:43 UTC (rev 3440)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-radio-astronomy/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-radio-astronomy/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-radio-astronomy/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-radio-astronomy \
+ @abs_top_builddir@/gr-radio-astronomy \
+ @srcdir@
Modified: gnuradio/trunk/gr-trellis/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-trellis/src/python/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-trellis/src/python/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-trellis/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-trellis/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-trellis/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-trellis \
+ @abs_top_builddir@/gr-trellis \
+ @srcdir@
Modified: gnuradio/trunk/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-usrp/src/run_tests.in 2006-08-27 18:10:05 UTC (rev
3439)
+++ gnuradio/trunk/gr-usrp/src/run_tests.in 2006-08-27 18:51:43 UTC (rev
3440)
@@ -1,54 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-usrp/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-usrp/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-usrp/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-# Where to look for USRP lib in current build tree
address@hidden@/usrp/host/lib
-
-PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
address@hidden@/gnuradio-core/src/lib/.libs:@abs_top_builddir@/usrp/host/lib/.libs
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-usrp \
+ @abs_top_builddir@/gr-usrp \
+ @srcdir@
Modified: gnuradio/trunk/gr-video-sdl/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/run_tests.in 2006-08-27 18:10:05 UTC
(rev 3439)
+++ gnuradio/trunk/gr-video-sdl/src/run_tests.in 2006-08-27 18:51:43 UTC
(rev 3440)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 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
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-video-sdl/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-video-sdl/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-video-sdl/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-video-sdl \
+ @abs_top_builddir@/gr-video-sdl \
+ @srcdir@
Copied: gnuradio/trunk/run_tests.sh.in (from rev 3437,
gnuradio/branches/developers/jcorgan/ticket-3/run_tests.sh.in)
===================================================================
--- gnuradio/trunk/run_tests.sh.in (rev 0)
+++ gnuradio/trunk/run_tests.sh.in 2006-08-27 18:51:43 UTC (rev 3440)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# First argument is absolute path to top of component source directory
+# Second argument is absolute path to top of component build directory
+# Third argument is component source directory for qa tests
+
+# Where to find my swig generated shared library
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.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
+
+# Where to find core's swig generated shared libraries
address@hidden@/gnuradio-core/src/lib/swig
+grswigdir=$grswigdir:$grswigdir/.libs
+
+# Where to find core's python modules
address@hidden@/gnuradio-core/src/python
+
+# Where to find core's master library files
address@hidden@/gnuradio-core/src/lib
+grlibdir=$grlibdir:$grlibdir/.libs
+
+# Construct search path for python modules
+PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grpydir:$PYTHONPATH"
+export PYTHONPATH
+
+# For OS/X
+DYLD_LIBRARY_PATH=$grlibdir
+export DYLD_LIBRARY_PATH
+
+# Don't load user or system prefs
+GR_DONT_LOAD_PREFS=1
+export GR_DONT_LOAD_PREFS
+
+# Run everything that matches qa_*.py and return the final result.
+
+ok=yes
+for file in $3/qa_*.py
+do
+ if ! $file
+ then
+ ok=no
+ fi
+done
+
+if [ $ok = yes ]
+then
+ exit 0
+else
+ exit 1
+fi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3440 - in gnuradio/trunk: . gnuradio-core/src/python/gnuradio/gr gr-atsc/src/python gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-error-correcting-codes/src/python gr-ezdop/src/python gr-gsm-fr-vocoder/src/python gr-radar/src/python gr-radio-astronomy/src/python gr-trellis/src/python gr-usrp/src gr-video-sdl/src,
jcorgan <=