[Commit-gnuradio] r3435 - in gnuradio/branches/developers/jcorgan/ticket-3: . 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-usrp/src gr-video-sdl/src

[jcorgan]

Author: jcorgan
Date: 2006-08-26 21:47:14 -0600 (Sat, 26 Aug 2006)
New Revision: 3435

Modified:
   gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-alsa/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-jack/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-oss/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-osx/src/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-portaudio/src/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-windows/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-comedi/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-usrp/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/gr-video-sdl/src/run_tests.in
   gnuradio/branches/developers/jcorgan/ticket-3/run_tests.sh.in
Log:
Implements ticket:3 for gr-audio-oss, gr-audio-portaudio,
gr-audio-osx, gr-audio-alsa, gr-video-sdl, gr-audio-windows,
gr-comedi, and gr-audio-jack, which all implement the src/ component
layout.

Passes 'make check' from root directory; gr-audio-osx, gr-audio-windows,
gr-audio-portaudio not tested.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-alsa/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-alsa/src/run_tests.in    
    2006-08-27 03:23:51 UTC (rev 3434)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-alsa/src/run_tests.in    
    2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-audio-jack/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-jack/src/run_tests.in    
    2006-08-27 03:23:51 UTC (rev 3434)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-jack/src/run_tests.in    
    2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-audio-oss/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-oss/src/run_tests.in 
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-oss/src/run_tests.in 
2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-audio-osx/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-osx/src/run_tests.in 
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-osx/src/run_tests.in 
2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-audio-portaudio/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-portaudio/src/run_tests.in
   2006-08-27 03:23:51 UTC (rev 3434)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-portaudio/src/run_tests.in
   2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-audio-windows/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-windows/src/run_tests.in 
    2006-08-27 03:23:51 UTC (rev 3434)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-audio-windows/src/run_tests.in 
    2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-comedi/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/gr-comedi/src/run_tests.in    
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/gr-comedi/src/run_tests.in    
2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/gr-usrp/src/run_tests.in      
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/gr-usrp/src/run_tests.in      
2006-08-27 03:47:14 UTC (rev 3435)
@@ -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/branches/developers/jcorgan/ticket-3/gr-video-sdl/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/gr-video-sdl/src/run_tests.in 
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/gr-video-sdl/src/run_tests.in 
2006-08-27 03:47:14 UTC (rev 3435)
@@ -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@

Modified: gnuradio/branches/developers/jcorgan/ticket-3/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-3/run_tests.sh.in       
2006-08-27 03:23:51 UTC (rev 3434)
+++ gnuradio/branches/developers/jcorgan/ticket-3/run_tests.sh.in       
2006-08-27 03:47:14 UTC (rev 3435)
@@ -5,14 +5,13 @@
 # Third argument is component source directory for qa tests
 
 # Where to find my swig generated shared library
-mylibdir=$2/src/lib
-mylibdir=$mylibdir:$mylibdir/.libs
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
 
 # Where to find my swig generated python module
-mysrcdir=$1/src/lib
+mysrcdir=$1/src:$1/src/lib
 
 # Where to find my hand written python modules
-mypydir=$1/src/python
+mypydir=$1/src:$1/src/python
 
 # Where to find core's swig generated shared libraries
 address@hidden@/gnuradio-core/src/lib/swig