Changeset 17747

Timestamp:

08/17/08 11:33:31 (5 years ago)

Author:

tokuhirom

Message:

irefactoring

Files:

• lang/perl/HTTP-Engine/trunk/t/FCGIUtils.pm (modified) (4 diffs)

lang/perl/HTTP-Engine/trunk/t/FCGIUtils.pm

@@ -17 +17 @@
 
 sub test_lighty ($&) {
-    my ($fcgisrc, $callback) = @_;
+    my ($fcgisrc, $callback, $port) = @_;
+    $port ||= empty_port;
 
     plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
@@ -32 +33 @@
 
     my $tmpdir = File::Temp::tempdir();
-    my $port    = empty_port;
 
-    my ($fcgifh, $fcgifname) = File::Temp::tempfile();
-    print {$fcgifh} $fcgisrc;
-    close $fcgifh;
-    chmod 0777, $fcgifname;
+    my $fcgifname = File::Spec->catfile($tmpdir, "test.fcgi");
+    do {
+        _write_file($fcgifname => $fcgisrc);
+        chmod 0777, $fcgifname;
+        warn `perl -wc $fcgifname` if $ENV{DEBUG};
+    };
 
     my $conf = <<"END";
@@ -73 +75 @@
 END
 
-    my ($conffh, $confname) = File::Temp::tempfile();
-    print {$conffh} $conf or die "Write error: $!";
-    close $conffh;
+    my $conffname = File::Spec->catfile($tmpdir, "lighty.conf");
+    _write_file($conffname => $conf);
 
-    my $pid = open my $lighttpd, "$lighttpd_bin -D -f $confname 2>&1 |" 
+    my $pid = open my $lighttpd, "$lighttpd_bin -D -f $conffname 2>&1 |" 
         or die "Unable to spawn lighttpd: $!";
 
@@ -84 +85 @@
     $callback->($port);
 
+    warn `cat $tmpdir/error.log` if $ENV{DEBUG};
+
     kill 'INT', $pid;
     close $lighttpd;
 }
 
+sub _write_file {
+    my ($fname, $src) = @_;
+    open my $fh, '>', $fname or die $!;
+    print {$fh} $src or die $!;
+    close $fh;
+}
+
 1;