[Commit-gnuradio] r4976 - in gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src: lib/runtime python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2007-04-12 22:05:26 -0600 (Thu, 12 Apr 2007)
New Revision: 4976

Removed:
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.i
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_simple_flowgraph.py
Modified:
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/runtime.i
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
Log:
Handle QA for gr_simple_flowgraph through qa_hier_block2.py, and stop exporting 
gr.simple_flow_graph into Python.

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/Makefile.am
        2007-04-12 23:09:36 UTC (rev 4975)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/Makefile.am
        2007-04-13 04:05:26 UTC (rev 4976)
@@ -129,7 +129,6 @@
        gr_msg_queue.i                  \
        gr_realtime.i                   \
        gr_runtime.i                    \
-       gr_simple_flowgraph.i           \
        gr_single_threaded_scheduler.i  \
        gr_sync_block.i                 \
        gr_sync_decimator.i             \

Deleted: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.i

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/runtime.i
  2007-04-12 23:09:36 UTC (rev 4975)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/runtime.i
  2007-04-13 04:05:26 UTC (rev 4976)
@@ -28,7 +28,6 @@
 #include <gr_block_detail.h>
 #include <gr_hier_block2.h>
 #include <gr_runtime.h>
-#include <gr_simple_flowgraph.h>
 #include <gr_single_threaded_scheduler.h>
 #include <gr_message.h>
 #include <gr_msg_handler.h>
@@ -48,7 +47,6 @@
 %include <gr_block_detail.i>
 %include <gr_hier_block2.i>
 %include <gr_swig_block_magic.i>
-%include <gr_simple_flowgraph.i>
 %include <gr_single_threaded_scheduler.i>
 %include <gr_message.i>
 %include <gr_msg_handler.i>

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-12 23:09:36 UTC (rev 4975)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-13 04:05:26 UTC (rev 4976)
@@ -116,7 +116,7 @@
        hblock.connect(nop1, 0, nop2, 0)
         hblock.disconnect(nop1, 0, nop2, 0)
 
-    def dont_test_013_disconnect_not_connected(self):
+    def test_013_disconnect_not_connected(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -127,7 +127,7 @@
        self.assertRaises(ValueError, 
            lambda: hblock.disconnect(nop1, 0, nop3, 0))
 
-    def dont_test_014_run(self):
+    def test_014_run(self):
         expected = (1.0, 2.0, 3.0, 4.0)
         hblock = gr.hier_block2("test_block",
                                 gr.io_signature(0,0,0),

Deleted: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_simple_flowgraph.py