Changeset 21814 for util

Timestamp:

08/06/08 20:57:19 (4 months ago)

Author:

audreyt

Message:

* Solve the timeout problem at another direction by introducing PUGS_TIMEOUT

environment variable and have it set to 60 in yaml_harness.pl.

Location:

util

Files:

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

util/run-smoke.pl

@@ -31 +31 @@
 
 my $failed = 0;
-for (qw/YAML Test::TAP::Model Test::TAP::HTMLMatrix Best Time::Out/) {
+for (qw/YAML Test::TAP::Model Test::TAP::HTMLMatrix Best/) {
     check_prereq($_) or $failed++;
 }
@@ -43 +43 @@
 
   cpan Task::Smoke
-  cpan Time::Out
 EOF
 

util/yaml_harness.pl

@@ -278 +278 @@
     my @rest = @_;
     my $kid  = $self->{_child_num} ? "[$self->{_child_num}] " : "";
-    warn "$kid$test\n";
-    use Time::HiRes;
-    use Time::Out 'timeout';
-    my $t = timeout(10, sub { timeit( 1,
+
+    local $ENV{PUGS_TIMEOUT} ||= 60;
+    my $t = timeit( 1,
         sub { $self->SUPER::run_test($test, @rest) }
-    ) });
-    if ($Test::Harness::Straps::GLOBAL_FH) {
-        warn $Test::Harness::Straps::GLOBAL_FH;
-        die "We really want to kill ths FH child here... but how?";
-        close $Test::Harness::Straps::GLOBAL_FH;
-    }
+    );
     warn "    ".timestr($t)."\n";
 }
 
-use Test::Harness::Straps ();
-
-package Test::Harness::Straps;
-use vars '$GLOBAL_FH';
-no warnings 'redefine';
-
-sub analyze_fh {
-    my($self, $name, $fh) = @_;
-    $GLOBAL_FH = $fh;
-
-    my $it = Test::Harness::Iterator->new($fh);
-
-    my $results;
-    $results = $self->_analyze_iterator($name, $it);
-    undef $GLOBAL_FH;
-    return $results;
-}
 __END__
 # Simple YAML test harness written over Test::Harness::Straps.