[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/5] tap: some preparatory refactoring (2)
From: |
Stefano Lattarini |
Subject: |
[PATCH 7/5] tap: some preparatory refactoring (2) |
Date: |
Mon, 18 Jul 2011 10:28:33 +0200 |
User-agent: |
KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; ) |
This is a follow-up simplification.
* lib/tap-driver (console_output): Renamed ...
(report): ... to this, and extended to appropriately register
the test results when needed.
(testsuite_error, handle_tap_comment, handle_tap_test,
handle_tap_plan): Adjusted accordingly.
---
ChangeLog | 10 ++++++++++
lib/tap-driver | 14 ++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 01357d1..9cf06aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2011-07-18 Stefano Lattarini <address@hidden>
+ tap: some preparatory refactoring (2)
+ This is a follow-up simplification.
+ * lib/tap-driver (console_output): Renamed ...
+ (report): ... to this, and extended to appropriately register
+ the test results when needed.
+ (testsuite_error, handle_tap_comment, handle_tap_test,
+ handle_tap_plan): Adjusted accordingly.
+
+2011-07-18 Stefano Lattarini <address@hidden>
+
tap: some preparatory refactoring (1)
This refactoring is aimed at simplifying the introduction of
colored console output for the TAP driver.
diff --git a/lib/tap-driver b/lib/tap-driver
index eb505de..b669292 100755
--- a/lib/tap-driver
+++ b/lib/tap-driver
@@ -211,12 +211,13 @@ sub stringify_test_result ($)
die "INTERNAL ERROR"; # NOTREACHED
}
-sub console_output ($;$)
+sub report ($;$)
{
my ($msg, $result, $explanation) = (undef, @_);
if ($result =~ /^(?:X?(?:PASS|FAIL)|SKIP|ERROR)/)
{
$msg = "$result: $test_script_name";
+ add_test_result $result;
}
elsif ($result eq "#")
{
@@ -236,8 +237,7 @@ sub console_output ($;$)
sub testuite_error ($)
{
- add_test_result "ERROR";
- console_output "ERROR", "- $_[0]";
+ report "ERROR", "- $_[0]";
}
sub handle_tap_test ($)
@@ -268,8 +268,7 @@ sub handle_tap_test ($)
$string .= " $explanation";
}
}
- add_test_result $test_result;
- console_output $test_result, $string;
+ report $test_result, $string;
}
sub handle_tap_plan ($)
@@ -288,8 +287,7 @@ sub handle_tap_plan ($)
if not defined $plan->directive && length ($plan->directive) > 0;
my $explanation = $plan->explanation ?
"- " . $plan->explanation : undef;
- add_test_result "SKIP";
- console_output "SKIP", $explanation;
+ report "SKIP", $explanation;
finish;
}
@@ -305,7 +303,7 @@ sub handle_tap_comment ($)
{
return unless $cfg{comments};
my $comment = $_[0]->comment;
- console_output "#", "$comment" if length $comment;
+ report "#", "$comment" if length $comment;
}
sub main (@)
--
1.7.2.3
- Re: [PATCH] {test-protocols} docs: rework and extend documentation on testsuites support, (continued)
- [PATCH 3/5] {test-protocols} parallel-tests: simplify testsuite summary, Stefano Lattarini, 2011/07/14
- [PATCH 4/5] {test-protocols} tests defs: new auxiliary function 'count_test_results', Stefano Lattarini, 2011/07/14
- [PATCH 5/5] {test-protocols} tap: add experimental TAP-aware driver, Stefano Lattarini, 2011/07/14
- Re: [GSoC] Some patches for testsuite harness improvements and TAP support introduction, Ralf Wildenhues, 2011/07/18
- [PATCH 6/5] tap: some preparatory refactoring (1), Stefano Lattarini, 2011/07/18
- [PATCH 7/5] tap: some preparatory refactoring (2),
Stefano Lattarini <=
- [PATCH 8/5] tap: support colorization of testsuite progress output, Stefano Lattarini, 2011/07/18