Changeset 394

Timestamp:

06/26/2005 10:27:41 AM (3 years ago)

Author:

jan

Message:

switch to LigtyTest? module

Location:

branches/lighttpd-1.3.x/tests

Files:

• LightyTest.pm (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• core-request.t (modified) (1 diff)
• core-response.t (modified) (1 diff)
• core.t (modified) (1 diff)
• mod-access.t (modified) (1 diff)
• mod-auth.t (modified) (1 diff)
• mod-cgi.t (modified) (1 diff)
• mod-compress.t (modified) (1 diff)
• mod-fastcgi.t (modified) (1 diff)
• mod-proxy.t (modified) (1 diff)
• mod-redirect.t (modified) (1 diff)
• mod-rewrite.t (modified) (1 diff)
• mod-userdir.t (modified) (1 diff)
• request.t (modified) (1 diff)

branches/lighttpd-1.3.x/tests/LightyTest.pm

@@ -72 +72 @@
         system($self->{LIGHTTPD_PATH}." -f /tmp/cfg.file");
         # system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$lighttpd_path." -D -f /tmp/cfg.file &");
-
-        sleep(1);
+        #
+        
+        select(undef, undef, undef, 0.1);
+
+        # sleep(1);
 
         unlink("/tmp/cfg.file");

branches/lighttpd-1.3.x/tests/Makefile.am

@@ -13 +13 @@
 
 TESTS=\
-prepare.sh \
-run-tests.pl \
-cleanup.sh
+        prepare.sh \
+        run-tests.pl \
+        cleanup.sh
 
 CONFS=fastcgi-10.conf \
@@ -34 +34 @@
       mod-userdir.t \
       mod-rewrite.t \
-      request.t 
+      request.t \
+      LightyTest.pm
 
 
-TESTS_ENVIRONMENT=$(srcdir)/wrapper.sh $(srcdir) $(top_builddir)
+TESTS_ENVIRONMENT=$(srcdir)/wrapper.sh $(srcdir) $(top_builddir) 
 
 EXTRA_DIST=wrapper.sh lighttpd.conf \
@@ -43 +44 @@
         $(CONFS) \
         $(TESTS)
+
 SUBDIRS=docroot
 

branches/lighttpd-1.3.x/tests/core-request.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/core-response.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/core.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-access.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-auth.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-cgi.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-compress.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-fastcgi.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-proxy.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-redirect.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-rewrite.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/mod-userdir.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;

branches/lighttpd-1.3.x/tests/request.t

@@ -1 +1 @@
 #! /usr/bin/perl -w
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
 
 use strict;