Merged r10539:10546 from michaelld/two_mods into trunk. Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10551 221aa14e-8319-0410-a670-987f0aec2ac5

5 files changed, 6 insertions, 63 deletions

diff --git a/gr-gpio/src/python/Makefile.am b/gr-gpio/src/python/Makefile.am
index b61a40805..ee5bdaadd 100644
--- a/gr-gpio/src/python/Makefile.am
+++ b/gr-gpio/src/python/Makefile.am
@@ -36,15 +36,4 @@ dist_bin_SCRIPTS = 			\
     gpio_usrp_siggen.py 		\
     gpio_usrp_fft.py
 
-# List of python files that will get distributed in tarball
-# but not installed anywhere on system
-noinst_PYTHON = 			\
-    qa_gpio.py
-
-# Programs that get run by 'make check'
-TESTS = run_tests
-
-# Files to go into tarball not otherwise mentioned
-EXTRA_DIST = run_tests.in
-
 MOSTLYCLEANFILES = *.pyo *.pyc *~
diff --git a/gr-gpio/src/python/gpio_rx_sfile.py b/gr-gpio/src/python/gpio_rx_sfile.py
index ac4d608bf..31f598ef7 100755
--- a/gr-gpio/src/python/gpio_rx_sfile.py
+++ b/gr-gpio/src/python/gpio_rx_sfile.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -79,8 +79,8 @@ class my_top_block(gr.top_block):
 	    self.connect(u, head)
 	    src = head
 
-	ana_strip = gpio.and_const_ss(0xFFFE)
-	dig_strip = gpio.and_const_ss(0x0001)
+	ana_strip = gr.and_const_ss(0xFFFE)
+	dig_strip = gr.and_const_ss(0x0001)
         ana_sink = gr.file_sink(gr.sizeof_short, options.ana_filename)
 	dig_sink = gr.file_sink(gr.sizeof_short, options.dig_filename)
     
diff --git a/gr-gpio/src/python/gpio_usrp_fft.py b/gr-gpio/src/python/gpio_usrp_fft.py
index cde0de05a..40b1c54d4 100755
--- a/gr-gpio/src/python/gpio_usrp_fft.py
+++ b/gr-gpio/src/python/gpio_usrp_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -144,10 +144,10 @@ class app_top_block(stdgui2.std_top_block):
           thr = gr.throttle(gr.sizeof_short, input_rate)
           self.connect(self.filesrc,thr,self.is2c,self.scope)
         elif options.digital:
-          self.select_dig=gpio.and_const_ss(0x0001)
+          self.select_dig=gr.and_const_ss(0x0001)
           self.connect(self.u, self.select_dig,self.is2c,self.scope)
         elif options.analog:
-          self.select_ana=gpio.and_const_ss(0xFFFE)
+          self.select_ana=gr.and_const_ss(0xFFFE)
           self.connect(self.u, self.select_ana,self.is2c,self.scope)
         else:
           self.connect(self.u,self.is2c,self.scope)
diff --git a/gr-gpio/src/python/qa_gpio.py b/gr-gpio/src/python/qa_gpio.py
deleted file mode 100755
index 1d140c248..000000000
--- a/gr-gpio/src/python/qa_gpio.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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 3, 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., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-from gnuradio import gr, gr_unittest
-# This is different from the usage after installation
-import gpio_swig
-
-class qa_gpio (gr_unittest.TestCase):
-
-    def setUp (self):
-        self.tb = gr.top_block()
-
-    def tearDown (self):
-        self.tb = None
-
-if __name__ == '__main__':
-    gr_unittest.main ()
diff --git a/gr-gpio/src/python/run_tests.in b/gr-gpio/src/python/run_tests.in
deleted file mode 100644
index 999e4634c..000000000
--- a/gr-gpio/src/python/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 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
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-gpio \
-    @abs_top_builddir@/gr-gpio \
-    @srcdir@