|
From: Ilya M. <m_...@us...> - 2002-10-19 22:38:02
|
Update of /cvsroot/http-webtest/HTTP-WebTest
In directory usw-pr-cvs1:/tmp/cvs-serv16194a
Modified Files:
Makefile.PL MANIFEST .cvsignore
Log Message:
Removing Apache plugin from HTTP-WebTest (to be published as separate
CPAN module)
Index: Makefile.PL
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/Makefile.PL,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.PL 24 Sep 2002 20:21:10 -0000 1.10
--- Makefile.PL 19 Oct 2002 22:37:55 -0000 1.11
***************
*** 26,30 ****
'Test::More' => 0,
'URI' => 0 },
- realclean => { FILES => '.config' },
EXE_FILES => [ File::Spec->catfile(qw(bin wt)) ],
AUTHOR => $AUTHOR,
--- 26,29 ----
***************
*** 43,57 ****
}
- sub test {
- my $self = shift;
-
- my $make = $self->SUPER::test(@_);
-
- # add dependencies for test targets
- $make =~ s/(test(?:db)? :: )(.*)/$1test_config $2/g;
-
- return $make;
- }
-
sub dist_core {
my $self = shift;
--- 42,45 ----
***************
*** 68,78 ****
my $make = '';
- # verify standard input and output are attached to a terminal
- if(-t STDIN and -t STDOUT) {
- $make .= apache_dir_setup();
-
- print STDOUT "\n";
- }
-
# add pod merge target
my $webtest_pm = File::Spec->catfile(qw(lib HTTP WebTest.pm));
--- 56,59 ----
***************
*** 103,175 ****
MAKE
- # add test_config target (test and testdb targets depend on it)
- my $test_config_pl = File::Spec->catfile(qw(scripts test_config.PL));
- $make .= <<MAKE;
-
- test_config:
- \t\$(PERL) $test_config_pl .config
- MAKE
-
- return $make;
- }
-
- # asks if http-webtest directory should be installed and adds to
- # makefile target to install http-webtest directory if required
- sub apache_dir_setup {
- my $apache_dir = undef;
-
- # verify that we don't run on Win32 system. Local web files
- # test mode is not supported on that platform
- if($^O ne 'MSWin32') {
- while(1) {
- print_prompt(<<TEXT);
-
- HTTP-WebTest requires installation of the http-webtest directory for
- running local file tests. If you do not use local file tests you can
- skip installation of this directory.
-
- Install http-webtest directory? [Y/n]:
- TEXT
-
- my $response = <STDIN>;
- chomp($response);
- if($response =~ /^(?:y(?:es)?|)$/i) {
- # user asked for directory installation
- $apache_dir = '/usr/local/etc';
-
- print_prompt(<<TEXT);
-
- Enter directory that will contain http-webtest directory.
-
- Directory? [$apache_dir]:
- TEXT
-
- my $response = <STDIN>;
- chomp($response);
- $apache_dir = $response if $response;
- last if -d $apache_dir;
- print STDOUT <<TEXT;
-
- ERROR: $apache_dir is not a valid directory
- TEXT
- } else {
- last;
- }
- }
- }
-
- my $make = defined $apache_dir ? <<TEXT : '';
-
- pure_install ::
- \t-\@\$(CP) -r http-webtest $apache_dir
-
- TEXT
-
return $make;
- }
-
- sub print_prompt {
- my $text = shift;
- chomp $text;
- print STDOUT $text, ' ';
}
--- 84,87 ----
Index: MANIFEST
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/MANIFEST,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** MANIFEST 24 Sep 2002 21:15:23 -0000 1.25
--- MANIFEST 19 Oct 2002 22:37:55 -0000 1.26
***************
*** 17,21 ****
lib/HTTP/WebTest/Parser.pm
lib/HTTP/WebTest/Plugin.pm
- lib/HTTP/WebTest/Plugin/Apache.pm
lib/HTTP/WebTest/Plugin/Click.pm
lib/HTTP/WebTest/Plugin/ContentSizeTest.pm
--- 17,20 ----
***************
*** 39,47 ****
scripts/make_readme.PL
scripts/pod_merge.PL
- scripts/test_config.PL
t/01-api.t
t/02-generic.t
t/03-proxy.t
- t/04-apache.t
t/05-report.t
t/06-parser.t
--- 38,44 ----
***************
*** 68,80 ****
t/real.wt.in
t/simple.wt
- t/test.out/apache1
- t/test.out/apache2
- t/test.out/apache3
- t/test.out/apache4
- t/test.out/apache5
- t/test.out/apache6
- t/test.out/apache7
- t/test.out/apache8
- t/test.out/apache9
t/test.out/auth
t/test.out/borked1.err
--- 65,68 ----
Index: .cvsignore
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore 15 Jun 2002 21:49:51 -0000 1.3
--- .cvsignore 19 Oct 2002 22:37:55 -0000 1.4
***************
*** 1,3 ****
- .config
wt
blib
--- 1,2 ----
|
