Changeset 17103 for util

Timestamp:

07/20/07 01:34:50 (16 months ago)

Author:

szbalint

Message:

Neatening run-smoke.pl up a bit.

Files:

• util/run-smoke.pl (modified) (7 diffs)

util/run-smoke.pl

@@ -3 +3 @@
 use strict;
 use warnings;
-use Shell qw(svn);
 use Config;
 use File::Spec;
@@ -9 +8 @@
 use lib File::Spec->catdir($FindBin::Bin, "..", "inc");
 use PugsBuild::Config;
+
+#
+# run-smoke.pl /some/sandbox/dir /some/www/file.html
+#
+my $pugs_sandbox    = $ARGV[0] or die "Need pugs sandbox location";
+my $html_location   = $ARGV[1] or die "Need HTML output file location";
+my $optional_args   = $ARGV[2] || "";
+
+
+sub check_prereq {
+    my ($mod) = @_;
+    (my $file = $mod) =~ s,::,/,g;
+    if (eval { require "$file.pm"; 1 }) {
+        return 1;
+    }
+    else {
+        warn "$mod - missing dependency\n";
+        warn "($@)\n" if $@ and $@ !~ /Can't locate \Q$file\E/;
+        return 0;
+    }
+}
 
 my $failed = 0;
@@ -24 +44 @@
   cpan Task::Smoke
 EOF
-#'
 
-#
-# run-smoke.pl /some/sandbox/dir /some/www/file.html
-#
-my $pugs_sandbox    = $ARGV[0] or die "Need pugs sandbox location";
-my $html_location   = $ARGV[1] or die "Need HTML output file location";
-my $optional_args   = $ARGV[2] || "";
-
-my $smoke_upload     = PugsBuild::Config->lookup('smoke_upload');
-my $smoke_upload_script = File::Spec->canonpath('./util/smokeserv/smokeserv-client.pl'); 
-
-chdir($pugs_sandbox) or die "Could change directory: $!";
+chdir($pugs_sandbox) or die "Could not change directory to '$pugs_sandbox': $!";
 
 # '.' needs to be at the front of the path for everything to find the correct
@@ -46 +55 @@
 
 $ENV{HARNESS_PERL}  = "$ENV{HARNESS_PUGS} $optional_args";
-$ENV{HARNESS_PERL}  = "$^X $FindBin::Bin/../perl5/PIL2JS/pugs-smokejs.pl ./pugs $optional_args"
-    if $ENV{PUGS_RUNTIME} and $ENV{PUGS_RUNTIME} eq 'JS';
+if ($ENV{PUGS_RUNTIME}) {
+  if ($ENV{PUGS_RUNTIME} eq 'JS') {
 # XXX: hack to be identified by smokeserv
-$ENV{HARNESS_PERL}  = "$^X -I/tmp/JSPERL5 $FindBin::Bin/../perl5/PIL2JS/pugs-smokejs.pl ./pugs $optional_args"
-    if $ENV{PUGS_RUNTIME} and $ENV{PUGS_RUNTIME} eq 'JSPERL5';
-if ($ENV{PUGS_RUNTIME} and $ENV{PUGS_RUNTIME} eq 'PERL5') {
-    $ENV{PERL5LIB} = 'blib6/pugs/perl5/lib:blib6/pugs/perl5/arch';
-    $ENV{HARNESS_PERL} = $^X;
-#    $ENV{HARNESS_PERL_SWITCHES} = "blib6/pugs/perl5/lib/v6.pm";
-}
-if ($ENV{PUGS_RUNTIME} and $ENV{PUGS_RUNTIME} eq 'REDSIX') {
-    $ENV{HARNESS_PERL}  = "./pugs -Bredsix";
+      $ENV{HARNESS_PERL}  = "$^X $FindBin::Bin/../perl5/PIL2JS/pugs-smokejs.pl ./pugs $optional_args"
+  } elsif ($ENV{PUGS_RUNTIME} eq 'JSPERL5') {
+      $ENV{HARNESS_PERL}  = "$^X -I/tmp/JSPERL5 $FindBin::Bin/../perl5/PIL2JS/pugs-smokejs.pl ./pugs $optional_args"
+  } elsif ($ENV{PUGS_RUNTIME} eq 'PERL5') {
+      $ENV{PERL5LIB} = 'blib6/pugs/perl5/lib:blib6/pugs/perl5/arch';
+      $ENV{HARNESS_PERL} = $^X;
+     #$ENV{HARNESS_PERL_SWITCHES} = "blib6/pugs/perl5/lib/v6.pm";
+  } elsif ($ENV{PUGS_RUNTIME} eq 'REDSIX') {
+      $ENV{HARNESS_PERL}  = "./pugs -Bredsix";
+  }
 }
 
-
-$ENV{PERL6LIB}      = join $Config{path_sep},
-        qw<ext/Test/lib blib6/lib>, $ENV{PERL6LIB}||"";
+$ENV{PERL6LIB} = join $Config{path_sep}, qw<ext/Test/lib blib6/lib>, $ENV{PERL6LIB}||"";
 
 my @yaml_harness_args;
@@ -71 +79 @@
                    $ENV{PUGS_RUNTIME} eq 'PERL5' or $ENV{PUGS_RUNTIME} eq 'JSPERL5'));
 
-sub make { return `$Config{make} @_` };
 my $dev_null = File::Spec->devnull;
 
-my $output ;# = svn("up") or die "Could not update pugs tree: $!";
+my $output;
 my $yml_location = $html_location;
 $yml_location =~ s/(\.html?(\+)?)?$/'.yml'.($2||'')/e;
+push @yaml_harness_args, ('--output-file', $yml_location);
 
 # Save backups of prior html and yaml
@@ -89 +97 @@
 }
 
-push @yaml_harness_args, ('--output-file', $yml_location);
-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', $yml_location), $html_location) == 0 or die "Could not convert .yml to testgraph: $!";
-upload_smoke($html_location, $yml_location);
+# Attempting the smoke
+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', $yml_location), $html_location) == 0
+    or die "Could not convert .yml to testgraph: $!";
+
+if (defined $ENV{PUGS_SMOKE_UPLOAD}) {
+    system("$^X $ENV{PUGS_SMOKE_UPLOAD} $html_location $yml_location") == 0
+        or die "Couldn't run user smoke upload command: $!";
+}
+my $smoke_upload = PugsBuild::Config->lookup('smoke_upload');
+my $smoke_upload_script = File::Spec->canonpath('./util/smokeserv/smokeserv-client.pl'); 
 if ($smoke_upload) {
   if (defined $smoke_upload_script) {
-    system($^X => $smoke_upload_script, $html_location, $yml_location) == 0
-        or die "Couln't run smoke upload script: $!";
+    system($^X, $smoke_upload_script, $html_location, $yml_location) == 0
+        or die "Couldn't run smoke upload script: $!";
   }
 } else {
@@ -116 +131 @@
     }
 }
-sub upload_smoke {
-    my ($html, $yml) = @_;
-    return unless defined $ENV{PUGS_SMOKE_UPLOAD};
-    system("$^X $ENV{PUGS_SMOKE_UPLOAD} $html $yml") == 0 or die "couldn't run user smoke upload command: $!";
-}
-
-sub check_prereq {
-    my ($mod) = @_;
-    (my $file = $mod) =~ s,::,/,g;
-    if (eval { require "$file.pm"; 1 }) {
-        return 1;
-    }
-    else {
-        warn "$mod - missing dependency\n";
-        warn "($@)\n" if $@ and $@ !~ /Can't locate \Q$file\E/;
-        return 0;
-    }
-}
-# END