[svn:parrot] r33630 - branches/testparrottest/lib/Parrot

[jkeenan]

Author: jkeenan
Date: Sun Dec  7 11:48:39 2008
New Revision: 33630

Modified:
   branches/testparrottest/lib/Parrot/Test.pm

Log:
Revert to r33620.  My attempts to refactor caused tests in 'make test' to
begin to fail massively.


Modified: branches/testparrottest/lib/Parrot/Test.pm
==============================================================================
--- branches/testparrottest/lib/Parrot/Test.pm  (original)
+++ branches/testparrottest/lib/Parrot/Test.pm  Sun Dec  7 11:48:39 2008
@@ -213,19 +213,19 @@
                 \$extra{todo}
                 if defined $extra{todo};
 
-            if ($exit_code) {
+            if ( $func =~ /_error_/ ) {
+                return _handle_error_output( $builder, $real_output, 
$expected, $desc )
+                    unless $exit_code;
+            }
+            elsif ($exit_code) {
                 $builder->ok( 0, $desc );
                 $builder->diag( "Exited with error code: $exit_code\n"
                         . "Received:\n$real_output\nExpected:\n$expected\n" );
                 return 0;
             }
-            if ( $func =~ /_error_/ ) {
-                return _handle_error_output( $builder, $real_output, 
$expected, $desc );
-            }
             my $pass = $builder->$meth( $real_output, $expected, $desc );
             $builder->diag("'$cmd' failed with exit code $exit_code")
                 if not $pass and $exit_code;
-
             return $pass;
         };