You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/06/12 00:59:56 UTC
cvs commit: httpd-apreq-2/env Makefile.am
joes 2003/06/11 15:59:56
Modified: build test_config.pl
env Makefile.am
Log:
Cleanup env/ test.
Revision Changes Path
1.2 +6 -15 httpd-apreq-2/build/test_config.pl
Index: test_config.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/test_config.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_config.pl 20 May 2003 20:06:03 -0000 1.1
+++ test_config.pl 11 Jun 2003 22:59:56 -0000 1.2
@@ -50,24 +50,15 @@
$Apache::TestTrace::Level = 'debug';
bless my $cfg = Apache::Test->config();
+unless (-d "t/conf") {
+ warn "Creating t/conf directory.";
+ mkdir "t/conf" or die "mkdir 't/conf' failed: $!";
+}
+
$cfg->preamble(LoadModule => [apreq_module => "../.libs/mod_apreq.so"]);
$cfg->cmodules_configure;
$cfg->generate_httpd_conf;
-my @scripts = ();
-
-finddepth(sub {
- return unless /(.*?\.pl)\.PL$/;
- push @scripts, "$File::Find::dir/$1";
-}, '.');
-
Apache::TestMM::filter_args();
+Apache::TestRun->generate_script;
-for my $script (@scripts) {
- Apache::TestMM::generate_script($script);
-}
-
-for my $util (qw(Report Smoke Run)) {
- my $class = "Apache::Test${util}";
- $class->generate_script;
-}
1.8 +3 -1 httpd-apreq-2/env/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 20 May 2003 20:06:03 -0000 1.7
+++ Makefile.am 11 Jun 2003 22:59:56 -0000 1.8
@@ -27,13 +27,15 @@
test :: all run_tests
-test_clean :
+test_clean : cmodules_clean
@PERL@ t/TEST -clean
+ -rm -rf t/conf t/htdocs t/logs t/modules t/TEST
cmodules: test_config
cd c-modules && $(MAKE) all
cmodules_clean:
cd c-modules && $(MAKE) clean
+ -rm c-modules/Makefile c-modules/*/Makefile c-modules/apache_httpd_test.h
clean-local: test_clean cmodules_clean
Re: cvs commit: httpd-apreq-2/env Makefile.am
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Stas Bekman <st...@stason.org> writes:
> joes@apache.org wrote:
[...]
> > + warn "Creating t/conf directory.";
> > + mkdir "t/conf" or die "mkdir 't/conf' failed: $!";
>
> but Apache::Test does that for you, why do you need to create it
> manually? It just needs to run 't/TEST -conf' or 'make test' like
> at the top-level.
I was having trouble getting the c-modules to compile, and
waiting for t/TEST to set the correct linker flags was giving
me fits.
This was the first solution I came up with. If you have a
better approach, you know the routine :-)
--
Joe Schaefer
Re: cvs commit: httpd-apreq-2/env Makefile.am
Posted by Stas Bekman <st...@stason.org>.
joes@apache.org wrote:
> joes 2003/06/11 15:59:56
>
> Modified: build test_config.pl
> env Makefile.am
> Log:
> Cleanup env/ test.
>
> Revision Changes Path
> 1.2 +6 -15 httpd-apreq-2/build/test_config.pl
>
> Index: test_config.pl
> ===================================================================
> RCS file: /home/cvs/httpd-apreq-2/build/test_config.pl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- test_config.pl 20 May 2003 20:06:03 -0000 1.1
> +++ test_config.pl 11 Jun 2003 22:59:56 -0000 1.2
> @@ -50,24 +50,15 @@
> $Apache::TestTrace::Level = 'debug';
> bless my $cfg = Apache::Test->config();
>
> +unless (-d "t/conf") {
> + warn "Creating t/conf directory.";
> + mkdir "t/conf" or die "mkdir 't/conf' failed: $!";
> +}
but Apache::Test does that for you, why do you need to create it manually? It
just needs to run 't/TEST -conf' or 'make test' like at the top-level.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
Re: cvs commit: httpd-apreq-2/env Makefile.am
Posted by Stas Bekman <st...@stason.org>.
joes@apache.org wrote:
> joes 2003/06/11 15:59:56
>
> Modified: build test_config.pl
> env Makefile.am
> Log:
> Cleanup env/ test.
>
> Revision Changes Path
> 1.2 +6 -15 httpd-apreq-2/build/test_config.pl
>
> Index: test_config.pl
> ===================================================================
> RCS file: /home/cvs/httpd-apreq-2/build/test_config.pl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- test_config.pl 20 May 2003 20:06:03 -0000 1.1
> +++ test_config.pl 11 Jun 2003 22:59:56 -0000 1.2
> @@ -50,24 +50,15 @@
> $Apache::TestTrace::Level = 'debug';
> bless my $cfg = Apache::Test->config();
>
> +unless (-d "t/conf") {
> + warn "Creating t/conf directory.";
> + mkdir "t/conf" or die "mkdir 't/conf' failed: $!";
> +}
but Apache::Test does that for you, why do you need to create it manually? It
just needs to run 't/TEST -conf' or 'make test' like at the top-level.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com