4 files changed, 74 insertions, 37 deletions
diff --git a/gr-fcd/python/Makefile.am b/gr-fcd/python/Makefile.am
index acb20fbb17..a99bc19339 100644
--- a/gr-fcd/python/Makefile.am
+++ b/gr-fcd/python/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,5 +21,14 @@
 
 include $(top_srcdir)/Makefile.common
 
-modpython_PYTHON = \
-    __init__.py
+fcddir = $(grpythondir)/fcd
+
+TESTS = run_tests
+
+noinst_PYTHON = \
+	qa_fcd.py
+
+fcd_PYTHON = \
+	__init__.py
+
+EXTRA_DIST += run_tests.in
diff --git a/gr-fcd/python/__init__.py b/gr-fcd/python/__init__.py
index 76c05ebb3e..9e573450f6 100644
--- a/gr-fcd/python/__init__.py
+++ b/gr-fcd/python/__init__.py
@@ -1,49 +1,28 @@
 #
 # Copyright 2011 Free Software Foundation, Inc.
 # 
-# This application is free software; you can redistribute it and/or modify
+# 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.
 # 
-# This application is distributed in the hope that it will be useful,
+# 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-# The presence of this file turns this directory into a Python package
-
-# ----------------------------------------------------------------
-# Temporary workaround for ticket:181 (swig+python problem)
-import sys
-_RTLD_GLOBAL = 0
-try:
-    from dl import RTLD_GLOBAL as _RTLD_GLOBAL
-except ImportError:
-    try:
-	from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
-    except ImportError:
-	pass
-    
-if _RTLD_GLOBAL != 0:
-    _dlopenflags = sys.getdlopenflags()
-    sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
-# ----------------------------------------------------------------
+# 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.
+# 
 
+'''
+This is the gr-fcd package. This package provides a GNU Radio
+source block for the FunCube Dongle hardware.
+'''
 
-# import swig generated symbols into the fcd namespace
 from fcd_swig import *
 
-# import any pure python here
-#
-
-# ----------------------------------------------------------------
-# Tail of workaround
-if _RTLD_GLOBAL != 0:
-    sys.setdlopenflags(_dlopenflags)      # Restore original flags
-# ----------------------------------------------------------------
diff --git a/gr-fcd/python/qa_fcd.py b/gr-fcd/python/qa_fcd.py
new file mode 100755
index 0000000000..f2546ce92e
--- /dev/null
+++ b/gr-fcd/python/qa_fcd.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# Copyright 2012 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
+import fcd_swig
+
+class test_fcd(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_000_nop (self):
+        """Just see if we can import the module..."""
+        pass
+    
+if __name__ == '__main__':
+    gr_unittest.run(test_fcd, "test_fcd.xml")
diff --git a/gr-fcd/python/run_tests.in b/gr-fcd/python/run_tests.in
new file mode 100644
index 0000000000..4d28c1522d
--- /dev/null
+++ b/gr-fcd/python/run_tests.in
@@ -0,0 +1,10 @@
+#!/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-fcd \
+    @abs_top_builddir@/gr-fcd \
+    @srcdir@