Fixes to make tests work when building outside the sources directory.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index c3155848d2280baf8d8d0f61ae59ed2301e4d448..48d0f971a083b63bd11e6ef9bd589060b891c547 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-25  Benjamin Wolsey  <bwy@benjaminwolsey.de>
+
+       * Makefile.am (run-px-tests): Ensure run-px is run from srcdir.
+
+       * run-px: Include modules from srcdir.
+
 2008-11-25  Steven Schubiger  <stsc@members.fsf.org>
 
        * WgetTest.pm.in: Remove the magic interpreter line;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6e703f012bf9cf165e80b193893b92c9b7c13a11..068c15e22967dcdfe956f685e236a6badfe10680 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -55,7 +55,7 @@ run-unit-tests: unit-tests$(EXEEXT)
        ./unit-tests$(EXEEXT)
 
 run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
-       ./run-px $(top_srcdir)
+       $(srcdir)/run-px $(top_srcdir)
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
             Test-auth-basic.px Test-c-full.px Test-c-partial.px \

diff --git a/tests/run-px b/tests/run-px
index 0f8f29648aa21f2df19a2068c628772e081bfe51..6fe0d9fbb7532dbb06c1854788c50e9691b950ff 100755 (executable)
--- a/tests/run-px
+++ b/tests/run-px
@@ -59,7 +59,7 @@ my @tested;
 
 foreach my $test (@tests) {
     print "Running $test\n\n";
-    system("$^X $top_srcdir/tests/$test");
+    system("$^X -I$top_srcdir/tests $top_srcdir/tests/$test");
     push @tested, { name => $test, result => $? };
 }