Changeset 6537

Timestamp:

08/28/05 20:16:12 (3 years ago)

Author:

putter

Message:

Consolidated ENV{PUGS_RUNTIME} hackery in run-smoke. yaml_harness is now backend-clean.
yaml_harness.pl: --exclude now takes a regex pattern rather than a string, and it is applied to the path, not just the bare filename.

Location:

util

Files:

• run-smoke.pl (modified) (2 diffs)
• yaml_harness.pl (modified) (3 diffs)

util/run-smoke.pl

@@ -18 +18 @@
 Please install it from the CPAN and try again.
 EOF
+#'
 
 #
@@ -37 +38 @@
         qw<ext/Test/lib blib6/lib>, $ENV{PERL6LIB};
 
+my @yaml_harness_args;
+push(@yaml_harness_args,'--exclude','Disabled,^ext\b')
+    if $ENV{PUGS_RUNTIME} and ($ENV{PUGS_RUNTIME} eq 'JS' or
+                               $ENV{PUGS_RUNTIME} eq 'PERL5');
+
 sub make { return `$Config{make} @_` };
 my $dev_null = File::Spec->devnull;
 
 my $output ;# = svn("up") or die "Could not update pugs tree: $!";
-system($^X, qw(-w ./util/yaml_harness.pl)) == 0 or die "Could not run yaml harness: $!";
+system($^X, qw(-w ./util/yaml_harness.pl),@yaml_harness_args) == 0 or die "Could not run yaml harness: $!";
 system($^X, qw(-w ./util/testgraph.pl --inlinecss tests.yml), $html_location) == 0 or die "Could not convert .yml to testgraph: $!";
 upload_smoke($html_location);

util/yaml_harness.pl

@@ -39 +39 @@
 push @{$Config{"exclude"}}, 'Disabled' if not $Config{"exclude"} or not @{$Config{"exclude"}};
 if(!@ARGV) {
-  if($ENV{PUGS_RUNTIME} and $ENV{PUGS_RUNTIME} eq 'JS') {
-    @ARGV = < t/ >;
-  } else {
     @ARGV = glob "t/ ext/*/t/";
-  }
 }
 
@@ -76 +72 @@
             next if $file eq ".svn";
             next if $file eq "CVS";
-            next if $Config{exclude_re} && $file =~ $Config{exclude_re};
-
             my $currfile = File::Spec->catfile( $start, $file );
+            next if $Config{exclude_re} && $currfile =~ $Config{exclude_re};
+
             if ( -d $currfile ) {
                 push( @hits, all_in( $currfile ) ) if $Config{recurse};
@@ -127 +123 @@
 
 sub _build_exclude_re {
-    my $excl = join "|", map { quotemeta }
+    my $excl = join "|", # map { quotemeta }
         map { split /,/ } @{ $Config{exclude} };
     $Config{exclude_re} = qr/($excl)/ if $excl;