[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3444 - in gnuradio/branches/developers/michaelld/gr-e
From: |
michaelld |
Subject: |
[Commit-gnuradio] r3444 - in gnuradio/branches/developers/michaelld/gr-ecc-qa-wip: . 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 gr-error-correcting-codes/examples gr-error-correcting-codes/src/lib 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 13:20:04 -0600 (MDT) |
Author: michaelld
Date: 2006-08-27 13:20:04 -0600 (Sun, 27 Aug 2006)
New Revision: 3444
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_1.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_2.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_1.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_2.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_ecc.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/run_tests.sh.in
Removed:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/lib/qa_ecc.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_coding_1.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_coding_2.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_1.py
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_2.py
Modified:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/Makefile.am
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/configure.ac
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-atsc/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-alsa/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-jack/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-oss/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-osx/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-portaudio/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-windows/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-comedi/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/Makefile.am
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-ezdop/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-gsm-fr-vocoder/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radar/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radio-astronomy/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-trellis/src/python/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-usrp/src/run_tests.in
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-video-sdl/src/run_tests.in
Log:
Updated from r3439 to r3440 to get the run_tests.in changes.
Moved the non-standard QA tests to an "example" directory.
Enabled the python QA tests, and added one which just loads the ecc
module in python as its sole test.
Property changes on: gnuradio/branches/developers/michaelld/gr-ecc-qa-wip
___________________________________________________________________
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/branches/developers/michaelld/gr-ecc-qa-wip/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
+++ gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/Makefile.am
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/configure.ac
2006-08-27 19:07:13 UTC (rev 3443)
+++ gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/configure.ac
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/gr-atsc/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-atsc/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-atsc/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-alsa/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-alsa/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-alsa/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-audio-jack/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-jack/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-jack/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-audio-oss/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-oss/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-oss/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-audio-osx/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-osx/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-osx/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-audio-portaudio/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-portaudio/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-portaudio/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-audio-windows/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-windows/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-audio-windows/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-comedi/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-comedi/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-comedi/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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@
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_1.py
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_1.py
(rev 0)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_1.py
2006-08-27 19:20:04 UTC (rev 3444)
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2005 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from gnuradio import gr, audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+# must be imported from local directory so that make check
+# can run before installation
+import ecc
+
+class my_graph(gr.flow_graph):
+
+ def __init__(self):
+ gr.flow_graph.__init__(self)
+
+ parser = OptionParser(option_class=eng_option)
+ parser.add_option("-O", "--audio-output", type="string", default="",
+ help="pcm output device name. E.g., hw:0,0 or
/dev/dsp")
+ parser.add_option("-r", "--sample-rate", type="eng_float",
default=48000,
+ help="set sample rate to RATE (48000)")
+ (options, args) = parser.parse_args ()
+ if len(args) != 0:
+ parser.print_help()
+ raise SystemExit, 1
+
+ sample_rate = int(options.sample_rate)
+ audio_option = options.audio_output
+ src = audio.source (sample_rate, audio_option)
+ src_out_chan = src.output_signature().max_streams()
+ dst = audio.sink (sample_rate, str(src_out_chan))
+ dst_in_chan = dst.input_signature().max_streams()
+ audio_el_size = src.output_signature().sizeof_stream_item(1)
+ frame_size = 1000
+ do_mux_outputs = 0
+ enc_code_in_chan = src_out_chan
+ code_generators = [05, 06] #, 03, 04] # , 0, 07]
+ enc_code_out_chan = len (code_generators) / enc_code_in_chan
+ do_termination = 1
+
+ if do_mux_outputs == 1:
+ enc_dec_chan = 1
+ else:
+ enc_dec_chan = enc_code_out_chan
+
+ ss_enc = ecc.streams_encode_convolutional (frame_size,
+ enc_code_in_chan,
+ enc_code_out_chan,
+ code_generators,
+ do_termination)
+# for now
+ ss2s = gr.streams_to_stream (1, enc_dec_chan);
+ ns = gr.null_sink (1);
+# end for now
+
+# ss_dec = error-correcting-codes.frames_to_streams (audio_el_size, 1,
1000)
+
+ for i in range (src_out_chan):
+ self.connect ((src, i), (ss_enc, i))
+# for now
+ for i in range (enc_dec_chan):
+ self.connect ((ss_enc, i), (ss2s, i))
+ self.connect (ss2s, ns)
+# end for now
+
+# for i in range (enc_dec_chan):
+# self.connect ((ss_enc, i), (ss_dec, i))
+
+# for i in range (dst_in_chan):
+# self.connect ((ss_dec, i), (dst, i))
+
+if __name__ == '__main__':
+ try:
+ my_graph().run()
+ except KeyboardInterrupt:
+ pass
Property changes on:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_1.py
___________________________________________________________________
Name: svn:executable
+ *
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_2.py
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_2.py
(rev 0)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_2.py
2006-08-27 19:20:04 UTC (rev 3444)
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+#
+# Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from gnuradio import gr, audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+# must be imported from local directory so that make check
+# can run before installation
+import ecc
+
+class my_graph(gr.flow_graph):
+
+ def __init__(self):
+ gr.flow_graph.__init__(self)
+
+ parser = OptionParser(option_class=eng_option)
+ parser.add_option("-O", "--audio-output", type="string", default="",
+ help="pcm output device name. E.g., hw:0,0 or
/dev/dsp")
+ parser.add_option("-r", "--sample-rate", type="eng_float",
default=48000,
+ help="set sample rate to RATE (48000)")
+ (options, args) = parser.parse_args ()
+ if len(args) != 0:
+ parser.print_help()
+ raise SystemExit, 1
+
+ sample_rate = int(options.sample_rate)
+ audio_option = options.audio_output
+ src = audio.source (sample_rate, audio_option)
+ enc_chan_in = 2
+ src_out_chan = src.output_signature().max_streams()
+ dst = audio.sink (sample_rate, str(enc_chan_in))
+ dst_in_chan = dst.input_signature().max_streams()
+ audio_el_size = dst.input_signature().sizeof_stream_item(0)
+ frame_size = 10
+ enc_code_in_chan = enc_chan_in
+ code_generators = [05, 06] #, 03, 04] #, 0, 07]
+ enc_code_out_chan = len (code_generators) / enc_code_in_chan
+ do_termination = 1
+
+ ss_enc = ecc.streams_encode_convolutional (frame_size,
+ enc_code_in_chan,
+ enc_code_out_chan,
+ code_generators,
+ do_termination)
+
+ for i in range (src_out_chan):
+ p2up = gr.packed_to_unpacked_bb (1, 1)
+ self.connect ((src, i), p2up, (ss_enc, i))
+
+ tau_bits = 0 # 0 -> decode all first
+ ss_dec = error-correcting-codes.dec_blk_conv_soft_full (audio_el_size,
+ frame_size,
+ do_termination,
+ do_mux_outputs,
+ enc_code_in_chan,
+ enc_code_out_chan,
+ code_generators)
+ up2bf0 = gr.chunks_to_symbols_bf ([1.0, -1.0])
+ self.connect ((ss_enc, 0), p2up0, up2bf0, (ss_dec, 0))
+ if enc_dec_chan > 1:
+ p2up1 = gr.packed_to_unpacked_bb (1, 1)
+ up2bf1 = gr.chunks_to_symbols_bf ([1.0, -1.0])
+ self.connect ((ss_enc, 1), p2up1, up2bf1, (ss_dec, 1))
+
+ for i in range (dst_in_chan):
+ self.connect ((ss_dec, i), (dst, i))
+
+if __name__ == '__main__':
+ try:
+ my_graph().run()
+ except KeyboardInterrupt:
+ pass
Property changes on:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_coding_2.py
___________________________________________________________________
Name: svn:executable
+ *
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_1.py
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_1.py
(rev 0)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_1.py
2006-08-27 19:20:04 UTC (rev 3444)
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2005 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from gnuradio import gr, audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+# must be imported from local directory so that make check
+# can run before installation
+import ecc
+
+class my_graph(gr.flow_graph):
+
+ def __init__(self):
+ gr.flow_graph.__init__(self)
+
+ parser = OptionParser(option_class=eng_option)
+ parser.add_option("-O", "--audio-output", type="string", default="",
+ help="pcm output device name. E.g., hw:0,0 or
/dev/dsp")
+ parser.add_option("-r", "--sample-rate", type="eng_float",
default=48000,
+ help="set sample rate to RATE (48000)")
+ (options, args) = parser.parse_args ()
+ if len(args) != 0:
+ parser.print_help()
+ raise SystemExit, 1
+
+ sample_rate = int(options.sample_rate)
+ audio_option = options.audio_output
+ src = audio.source (sample_rate, audio_option)
+ src_out_chan = src.output_signature().max_streams()
+ dst = audio.sink (sample_rate, str(src_out_chan))
+ dst_in_chan = dst.input_signature().max_streams()
+ audio_el_size = src.output_signature().sizeof_stream_item(1)
+ frame_size = 10
+ enc_code_in_chan = src_out_chan
+ code_generators = [05, 06] #, 03, 04] # , 0, 07]
+ enc_code_out_chan = len (code_generators) / enc_code_in_chan
+ do_termination = 1
+
+ ss_enc = ecc.streams_encode_convolutional (frame_size,
+ enc_code_in_chan,
+ enc_code_out_chan,
+ code_generators,
+ do_termination)
+ for i in range (enc_code_in_chan):
+ self.connect ((src, i), (ss_enc, i))
+
+ for i in range (enc_code_out_chan):
+ ns = gr.null_sink (1)
+ self.connect ((ss_enc, i), ns)
+
+if __name__ == '__main__':
+ try:
+ my_graph().run()
+ except KeyboardInterrupt:
+ pass
Property changes on:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_1.py
___________________________________________________________________
Name: svn:executable
+ *
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_2.py
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_2.py
(rev 0)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_2.py
2006-08-27 19:20:04 UTC (rev 3444)
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+#
+# Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from gnuradio import gr
+from gnuradio.eng_option import eng_option
+import ecc
+
+def main ():
+ e1 = ecc.streams_encode_convolutional (100, 3, 2, [1, 0, 5, 0, 1, 6])
+
+ e2 = ecc.streams_encode_convolutional (100, 2, 3, [1, 0, 0, 1, 5, 6])
+
+ e3 = ecc.streams_encode_convolutional_feedback (100, 2, 3, [1, 7, 0, 1,
5, 6], [1, 1, 1, 1, 017, 017])
+
+if __name__ == '__main__':
+ main ()
Property changes on:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/examples/qa_test_encoder_convolutional_2.py
___________________________________________________________________
Name: svn:executable
+ *
Deleted:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/lib/qa_ecc.py
Modified:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 19:20:04 UTC (rev 3444)
@@ -23,10 +23,9 @@
EXTRA_DIST = run_tests.in
-# Disable qa checks due to non-standard directory structure (eb)
-# TESTS = run_tests
+TESTS = run_tests
-noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py
+noinst_PYTHON = qa_ecc.py
grpython_PYTHON =
Added:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_ecc.py
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_ecc.py
(rev 0)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_ecc.py
2006-08-27 19:20:04 UTC (rev 3444)
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+#
+# Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from gnuradio import gr, gr_unittest
+import ecc
+
+class qa_ecc (gr_unittest.TestCase):
+
+ def setUp (self):
+ self.fg = gr.flow_graph ()
+
+ def tearDown (self):
+ self.fg = None
+
+ def test_000_nop (self):
+ """Just see if we can import the module...
+ They may not have drivers, etc. Don't try to run anything"""
+ pass
+
+if __name__ == '__main__':
+ gr_unittest.main ()
Property changes on:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_ecc.py
___________________________________________________________________
Name: svn:executable
+ *
Deleted:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_coding_1.py
Deleted:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_coding_2.py
Deleted:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_1.py
Deleted:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_2.py
Modified:
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-ezdop/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-ezdop/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-ezdop/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-gsm-fr-vocoder/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-gsm-fr-vocoder/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-radar/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radar/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radar/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-radio-astronomy/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radio-astronomy/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-radio-astronomy/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-trellis/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-trellis/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-trellis/src/python/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/gr-usrp/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-usrp/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-usrp/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/michaelld/gr-ecc-qa-wip/gr-video-sdl/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-video-sdl/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
+++
gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/gr-video-sdl/src/run_tests.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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/branches/developers/michaelld/gr-ecc-qa-wip/run_tests.sh.in
(from rev 3440, gnuradio/trunk/run_tests.sh.in)
===================================================================
--- gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/run_tests.sh.in
(rev 0)
+++ gnuradio/branches/developers/michaelld/gr-ecc-qa-wip/run_tests.sh.in
2006-08-27 19:20:04 UTC (rev 3444)
@@ -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] r3444 - in gnuradio/branches/developers/michaelld/gr-ecc-qa-wip: . 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 gr-error-correcting-codes/examples gr-error-correcting-codes/src/lib 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,
michaelld <=