Merge branch 'master' into next

Conflicts:
	config/Makefile.am
	configure.ac

1 files changed, 39 insertions, 0 deletions

diff --git a/gr-fcd/python/qa_fcd.py b/gr-fcd/python/qa_fcd.py
new file mode 100755
index 000000000..f2546ce92
--- /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")