[Commit-gnuradio] r3434 - in gnuradio/branches/developers/jcorgan/ticket-3: 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

[jcorgan]

Author: jcorgan
Date: 2006-08-26 21:23:51 -0600 (Sat, 26 Aug 2006)
New Revision: 3434

Modified:
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-ezdop/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-gsm-fr-vocoder/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-radar/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-radio-astronomy/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ticket-3/gr-trellis/src/python/run_tests.in
Log:
Implements ticket:3 for gr-ezdop, gr-error-correcting-codes, 
gr-radio-astronomy, gr-radar, gr-trellis, and gr-gsm-fr-vocoder, all of
which use the src/lib and src/python component layout.

Note: qa testing is disabled for gr-error-correcting-codes, as it does
not find an audio module in the build tree (needs to be fixed.)


Modified: 
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/Makefile.am
      2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/Makefile.am
      2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/run_tests.in
     2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-error-correcting-codes/src/python/run_tests.in
     2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-ezdop/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-ezdop/src/python/run_tests.in  
    2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-ezdop/src/python/run_tests.in  
    2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-gsm-fr-vocoder/src/python/run_tests.in
     2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-gsm-fr-vocoder/src/python/run_tests.in
     2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-radar/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-radar/src/python/run_tests.in  
    2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-radar/src/python/run_tests.in  
    2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-radio-astronomy/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-radio-astronomy/src/python/run_tests.in
    2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-radio-astronomy/src/python/run_tests.in
    2006-08-27 03:23:51 UTC (rev 3434)
@@ -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/branches/developers/jcorgan/ticket-3/gr-trellis/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-3/gr-trellis/src/python/run_tests.in
    2006-08-27 02:53:27 UTC (rev 3433)
+++ 
gnuradio/branches/developers/jcorgan/ticket-3/gr-trellis/src/python/run_tests.in
    2006-08-27 03:23:51 UTC (rev 3434)
@@ -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@