start adding debug output to test harness

Whiteknight · Apr 22, 2011 · 2de0727 · 2de0727
1 parent d8321a6
commit 2de0727
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/harness/Harness.winxed b/src/harness/Harness.winxed
@@ -22,24 +22,27 @@ namespace Rosella
         // other named options.
         function run(var test_run, var view,
                 int run_inline [named,optional],  int has_ri [opt_flag],
-                int line_length [named,optional], int has_ll [opt_flag])
+                int line_length [named,optional], int has_ll [opt_flag],
+                int debug [named,optional], int has_dbg [opt_flag])
         {
             using Rosella.build;
 
             if (!has_ri)
                 run_inline = 0;
             if (!has_ll)
                 line_length = 0;
-            return self.run_internal(test_run, view, run_inline);
+            if (!has_dbg)
+                debug = 0;
+            return self.run_internal(test_run, view, run_inline, debug);
         }
 
         // Interal routine to run the harness
-        function run_internal(var test_run, var view, int run_inline)
+        function run_internal(var test_run, var view, int run_inline, int debug)
         {
 
             for (var test in test_run.tests()) {
                 view.start_test(test);
-                test.run(run_inline);
+                test.run(view, debug, run_inline);
                 test_run.update_test_stats(test);
                 view.end_test(test);
             }

diff --git a/src/harness/TestFile.winxed b/src/harness/TestFile.winxed
@@ -69,7 +69,7 @@ namespace Rosella { namespace Harness
             return string(self.status);
         }
 
-        function compile_and_execute()
+        function compile_and_execute(var view, int debug)
         {
             using Rosella.IO.swap_handles;
 
@@ -83,6 +83,7 @@ namespace Rosella { namespace Harness
                 sub();
             } catch(e) {
                 self.mark_test_abort(e);
+                view.debug(debug, e["message"]);
             }
             string output = stdout.readall();
             swap_handles(save_handles);
@@ -113,7 +114,7 @@ namespace Rosella { namespace Harness
             self.status = "EMPTY";
         }
 
-        function spawn_and_execute()
+        function spawn_and_execute(var view, int debug)
         {
             var pipe = new "FileHandle";
             pipe.encoding('utf8');
@@ -133,14 +134,12 @@ namespace Rosella { namespace Harness
             must_subclass("Rosella::Harness::TestFile");
         }
 
-        function run(int run_inline [optional], int has_ri [opt_flag])
+        function run(var view, int debug, int run_inline)
         {
-            if (!has_ri)
-                run_inline = 0;
             if (run_inline)
-                self.compile_and_execute();
+                self.compile_and_execute(view, debug);
             else
-                self.spawn_and_execute();
+                self.spawn_and_execute(view, debug);
 
             if (self.status == null || self.status != "ABORTED") {
                 if (self.has_tap_output()) {

diff --git a/src/harness/View.winxed b/src/harness/View.winxed
@@ -155,6 +155,11 @@ namespace Rosella { namespace Harness
             }
         }
 
+        function debug(int dbg, var msg)
+        {
+            say(sprintf("DEBUG: %s\n", [msg]));
+        }
+
         /* Internal Helper Routines
         */