[svn:mod_parrot] r198 - in mod_parrot/trunk: . t/lib/ModParrot

Author: jhorwitz
Date: Sat Aug  6 09:54:06 2005
New Revision: 198

Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in
   mod_parrot/trunk/README
   mod_parrot/trunk/t/lib/ModParrot/TestRun.pm
Log:
we now require Apache::Test 1.26 or later (for parrot support)


Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Sat Aug  6 09:54:06 2005
@@ -102,12 +102,12 @@ close(MAKEFILE);
 print "done.\n";
 
 print "Creating testing infrastructure...";
-eval "use Apache::TestConfig;";
+eval "use Apache::Test 1.26";
 unless ($@) {
     # don't use installed mod_parrot
     package ModParrot::TestRun;
-    use base Apache::TestRun;
-    use Apache::TestConfig;
+    use base Apache::TestRunParrot;
+    use Apache::TestConfigParrot;
 
     sub pre_configure
     {
@@ -124,7 +124,8 @@ unless ($@) {
     print "done.\n";
 }
 else {
-    print "missing Apache::Test -- SKIPPING.\n";
+    print "Apache::Test missing or earlier than 1.26.\n";
+    print "Skipping test setup!\n";
 }
 
 print "\nType 'make' to build mod_parrot.\n\n";

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Sat Aug  6 09:54:06 2005
@@ -54,9 +54,8 @@ libraries-clean:
 	done
 
 test-clean:
-	rm -f t/logs/*_log t/lib/handlers.pbc t/conf/httpd.conf \
-		t/conf/extra.conf t/conf/apache_test_config.pm t/TEST \
-		t/htdocs/index.html t/core.* nci_sig_test
+	if [ -x t/TEST ]; then t/TEST -clean; fi
+	rm -f nci_sig_test t/core.* t/lib/handlers.pbc t/TEST
 
 clean: files-clean libraries-clean gen-src-clean test-clean
 
@@ -71,4 +70,4 @@ nci_sig_test: nci_sig_test.o
 
 test: mod_parrot.la libraries nci_sig_test
 	$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.imc
-	$(PERL) t/TEST t/*.t
+	$(PERL) t/TEST

Modified: mod_parrot/trunk/README
==============================================================================
--- mod_parrot/trunk/README	(original)
+++ mod_parrot/trunk/README	Sat Aug  6 09:54:06 2005
@@ -21,7 +21,7 @@ REQUIREMENTS
 * Apache 2.0
 * Parrot source from SVN r8731 or later (earlier versions *may* work)
 * Perl 5.6.0 or later
-* Apache::Test 1.13 or later (for tests)
+* Apache::Test 1.26 or later (for tests)
 
 INSTALLATION
 ------------

Modified: mod_parrot/trunk/t/lib/ModParrot/TestRun.pm
==============================================================================
--- mod_parrot/trunk/t/lib/ModParrot/TestRun.pm	(original)
+++ mod_parrot/trunk/t/lib/ModParrot/TestRun.pm	Sat Aug  6 09:54:06 2005
@@ -18,8 +18,8 @@
 
 package ModParrot::TestRun;
 
-use base Apache::TestRun;
-use Apache::TestConfig;
+use base Apache::TestRunParrot;
+use Apache::TestConfigParrot;
 use Apache::Test;
 
 sub pre_configure