X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/96ccae07958e7b6fe402e90d9540b49a274d5419..96e83823c4b9ba26b6b65a7f5563d93fa21571ff:/t/regress.t

diff --git a/t/regress.t b/t/regress.t
index a10827b..06d926e 100755
--- a/t/regress.t
+++ b/t/regress.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
-use re '/ms';
+use re '/msx';
 use Getopt::Long qw(2.32 :config gnu_getopt);
 use Test::More;
 use File::Basename;
@@ -23,8 +23,7 @@ plan(tests => int @params);
 for my $candidate (@params) {
 	my $name = basename($candidate, '.out');
 	$name =~ tr/_/ /;
-	my $todo = $name =~ s/ #TODO$//;
-	local $TODO = $todo ? ' ' : undef;
+	local $TODO;
 
 	if (!-e $candidate) {
 		local $TODO = 'missing output';
@@ -38,8 +37,11 @@ for my $candidate (@params) {
 
 	my $script = $spec;
 	chomp $script;
+	$script =~ s/\h* [#]\h* todo \h* (.*?) \z//i
+		and $TODO = $+ || ' ';
 	my $wantexit = $script =~ s/\h+[?](\d+)\z// ? $1 : 0;
 	my $wantwarn = $script !~ s/[?]\z//;
+
 	my $shell = $script;
 	if ($script =~ /\|/) {
 		# explicit shell wrapper to capture all warnings