Changeset 910 for box/chris/merge/runtest.pl.in

Timestamp:

01/09/2006 00:43:40 (6 years ago)

Author:

chris

Message:

(refs #3)

Use strict and warnings for code safety.

Exit with status 2 on invalid usage.

Allow running multiple tests, comma separated.

Exit with status 2 if make fails for any test.

Exit with status 1 if any test fails.

File:

• box/chris/merge/runtest.pl.in (modified) (6 diffs)

box/chris/merge/runtest.pl.in

@@ -1 +1 @@
 #!@PERL@
+
+use strict;
+use warnings;
 
 use lib 'infrastructure';
@@ -6 +9 @@
 my ($test_name,$test_mode) = @ARGV;
 
-$test_mode = 'debug' if $test_mode eq '';
+$test_mode = 'debug' if not defined $test_mode or $test_mode eq '';
 
 if($test_name eq '' || ($test_mode ne 'debug' && $test_mode ne 'release'))
@@ -18 +21 @@
 
 __E
-        exit(0);
+        exit(2);
 }
 
 my @results;
+my $exit_code = 0;
 
 if($test_name ne 'ALL')
 {
-        # run one test
-        runtest($test_name);
+        # run one or more specified test
+        if ($test_name =~ m/,/)
+        {
+                foreach my $test (split m/,/, $test_name)
+                {
+                        runtest($test);
+                }
+        }
+        else
+        {
+                runtest($test_name);
+        }
 }
 else
@@ -58 +72 @@
 print "--------\n",join("\n",@results),"\n";
 
+exit $exit_code;
+
 sub runtest
 {
@@ -68 +84 @@
         {
                 push @results,"$t: make failed";
+                $exit_code = 2;
                 return;
         }
@@ -83 +100 @@
                 }
                 close RESULTS;
+
                 chomp $last;
                 push @results,"$t: $last";
+
+                if ($last ne "PASSED") 
+                { 
+                        $exit_code = 1;
+                }
         }
         else