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/09 06:00:46 UTC
cvs commit: httpd-apreq-2/t Makefile.am testall.c
joes 2003/06/08 21:00:46
Modified: . Makefile.am
env mod_apreq.c
glue/perl Makefile.PL README
glue/perl/xsbuilder apreq_xs_postperl.h
glue/perl/xsbuilder/Apache/Cookie Cookie_pm
glue/perl/xsbuilder/Apache/Request Apache__Request.h
Request_pm
glue/perl/xsbuilder/maps apreq_functions.map
src Makefile.am
t Makefile.am testall.c
Added: glue/perl/t TEST.PL
glue/perl/t/apreq-2 big_input.t cookie.t inherit.t request.t
glue/perl/t/response/TestApReq big_input.pm cookie.pm
inherit.pm request.pm
Log:
Add perl tests from apreq-1.
Revision Changes Path
1.7 +12 -1 httpd-apreq-2/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 3 May 2003 05:22:33 -0000 1.6
+++ Makefile.am 9 Jun 2003 04:00:44 -0000 1.7
@@ -2,5 +2,16 @@
SUBDIRS = src env t
EXTRA_DIST = INSTALL
-test: check
+test: lib_test env_test
+
+env_test:
+ cd env; make test
+
+lib_test: check
t/testall -v
+
+perl_test:
+ cd glue/perl; make test
+
+perl_glue:
+ cd glue/perl; @PERL@ ../../build/xsbuilder.pl run && @PERL@ Makefile.PL && make
\ No newline at end of file
1.15 +2 -0 httpd-apreq-2/env/mod_apreq.c
Index: mod_apreq.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/mod_apreq.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_apreq.c 20 May 2003 22:08:49 -0000 1.14
+++ mod_apreq.c 9 Jun 2003 04:00:44 -0000 1.15
@@ -171,6 +171,8 @@
if (strcmp(f->frec->name, filter_name) == 0)
return cfg->f = f;
}
+ apreq_log(APREQ_DEBUG 0, r,
+ "apreq filter is now added" );
return cfg->f = ap_add_input_filter(filter_name, NULL, r, r->connection);
}
1.2 +35 -12 httpd-apreq-2/glue/perl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 25 Apr 2003 03:17:47 -0000 1.1
+++ Makefile.PL 9 Jun 2003 04:00:45 -0000 1.2
@@ -10,11 +10,17 @@
use Apache::TestReport ();
use Apache::TestSmoke ();
use Apache::TestRun ();
-
+use Apache::TestConfigPerl ();
use File::Find qw(finddepth);
-
+use Cwd;
+cwd =~ m{^(.+httpd-apreq-2)} or die "Can't find base cvs directory";
+my $base_dir = $1;
+my $src_dir = "$base_dir/src";
+my $env_dir = "$base_dir/env";
my @scripts = ();
+system "../../build/xsbuilder.pl VERSION run";
+
finddepth(sub {
return unless /(.*?\.pl)\.PL$/;
push @scripts, "$File::Find::dir/$1";
@@ -22,18 +28,35 @@
Apache::TestMM::filter_args();
-for my $script (@scripts) {
- Apache::TestMM::generate_script($script);
-}
-
-for my $util (qw(Report Smoke Run)) {
- my $class = "Apache::Test${util}";
- $class->generate_script;
-}
+Apache::TestMM::generate_script("t/TEST");
+#for my $script (@scripts) {
+# Apache::TestMM::generate_script($script);
+#}
+
+
+#for my $util (qw(Report Smoke Run)) {
+# my $class = "Apache::Test${util}";
+# $class->generate_script;
+#}
WriteMakefile(
NAME => 'httpd-apreq-2',
VERSION => '0.01',
-# DIR => [qw(APREQ)],
- clean => { FILES => "@scripts" },
+ DIR => [qw(xs)],
+ clean => { DIRS => "blib", FILES => "@scripts" },
);
+
+__END__
+$Apache::TestTrace::Level = 'debug';
+my $cfg = Apache::Test->config();
+
+$cfg->preamble(IfModule => '!mod_apreq.c',
+ qq(LoadModule apreq_module "$env_dir/.libs/mod_apreq.so"\n));
+$cfg->configure_httpd;
+$cfg->configure_libmodperl;
+$cfg->configure_startup_pl;
+$cfg->save; # GRR! why doesn't this write the config file!?!?!?
+#$cfg->modules_configure_pm_tests;
+$cfg->generate_httpd_conf;
+
+__DATA__
1.3 +1 -0 httpd-apreq-2/glue/perl/README
Index: README
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README 7 Jun 2003 20:35:35 -0000 1.2
+++ README 9 Jun 2003 04:00:45 -0000 1.3
@@ -23,6 +23,7 @@
missing components: Apache::Request::Upload
+ Apache::Request::Parser
Can/should we collapse Apache::Cookie::Jar & Apache::Cookie::Table
1.1 httpd-apreq-2/glue/perl/t/TEST.PL
Index: TEST.PL
===================================================================
#!perl
use strict;
use warnings FATAL => 'all';
use lib qw(lib Apache-Test/lib);
use Cwd;
cwd =~ m{^(.+httpd-apreq-2)} or die "Can't find base cvs directory";
my $base_dir = $1;
my $env_dir = "$base_dir/env";
use base 'Apache::TestRunPerl';
main::->new->run(@ARGV);
sub configure_modperl {
my $self = shift;
my $cfg = $self->{test_config};
$cfg->preamble(IfModule => '!mod_apreq.c',
qq(LoadModule apreq_module "$env_dir/.libs/mod_apreq.so"\n));
$self->SUPER::configure_modperl();
}
1.1 httpd-apreq-2/glue/perl/t/apreq-2/big_input.t
Index: big_input.t
===================================================================
use strict;
use warnings FATAL => 'all';
# test the processing of variations of the key lengths and the keys
# numbers
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY POST_BODY);
my $location = "/TestApReq__big_input";
my @key_len = (5, 100, 305);
my @key_num = (5, 15, 26);
my @keys = ('a'..'z');
my @big_key_len = (100, 500, 5000, 10000);
my @big_key_num = (5, 15, 25);
my @big_keys = ('a'..'z');
plan tests => @key_len * @key_num + @big_key_len * @big_key_num;
# GET
my $len = 0;
for my $key_len (@key_len) {
for my $key_num (@key_num) {
my @query = ();
for my $key (@keys[0..($key_num-1)]) {
my $pair = "$key=" . 'd' x $key_len;
$len += length $pair;
push @query, $pair;
}
my $query = join "&", @query;
$len += @query - 1; # the stick with two ends one '&' char off
my $body = GET_BODY "$location?$query";
t_debug "# of keys : $key_num, key_len $key_len";
ok t_cmp(( ($key_len + 3) * $key_num - 1),
$body,
"GET long query");
}
}
# POST
$len = 0;
for my $big_key_len (@big_key_len) {
for my $big_key_num (@big_key_num) {
my @query = ();
for my $big_key (@big_keys[0..($big_key_num-1)]) {
my $pair = "$big_key=" . 'd' x $big_key_len;
$len += length $pair;
push @query, $pair;
}
my $query = join "&", @query;
$len += @query - 1; # the stick with two ends one '&' char off
my $body = POST_BODY $location, content => $query;
t_debug "# of keys : $big_key_num, key_len $big_key_len";
ok t_cmp(( ($big_key_len + 3) * $big_key_num - 1),
$body,
"POST big data");
}
}
1.1 httpd-apreq-2/glue/perl/t/apreq-2/cookie.t
Index: cookie.t
===================================================================
use strict;
use warnings FATAL => 'all';
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY);
use HTTP::Cookies;
plan tests => 1;
my $location = "/TestApReq__cookie";
{
# basic param() test
my $test = 'basic';
my $key = 'apache';
my $value = 'ok';
my $cookie = qq{\$Version="1"; $key="$value"; \$Path="$location"};
ok t_cmp(qq{"$value"},
GET_BODY("$location?test=$test&key=$key", Cookie => $cookie),
$test);
}
1.1 httpd-apreq-2/glue/perl/t/apreq-2/inherit.t
Index: inherit.t
===================================================================
use strict;
use warnings FATAL => 'all';
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY UPLOAD_BODY);
plan tests => 1;
my $location = "/TestApReq__inherit";
ok t_cmp(<< 'VALUE', GET_BODY($location), "inheritance");
method => GET
VALUE
1.1 httpd-apreq-2/glue/perl/t/apreq-2/request.t
Index: request.t
===================================================================
use strict;
use warnings FATAL => 'all';
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY UPLOAD_BODY);
plan tests => 2;
my $location = "/TestApReq__request";
#print GET_BODY $location;
{
# basic param() test
my $test = 'param';
my $value = '42.5';
ok t_cmp($value,
GET_BODY("$location?test=$test&value=$value"),
"basic param");
}
{
# upload a string as a file
my $test = 'upload';
my $value = 'data upload';
ok t_cmp($value,
UPLOAD_BODY("$location?test=$test", content => $value),
"basic upload");
}
1.1 httpd-apreq-2/glue/perl/t/response/TestApReq/big_input.pm
Index: big_input.pm
===================================================================
package TestApReq::big_input;
use strict;
use warnings FATAL => 'all';
use Apache::Request ();
use Apache::RequestIO;
use Apache::RequestRec;
use Apache::Connection;
use APR;
use APR::Brigade;
use APR::Bucket;
use Apache::Filter;
sub handler {
my $r = shift;
my $apr = Apache::Request->new($r);
my $f = $r->input_filters;
my $method = $r->method;
my $bb = APR::Brigade->new($r->pool,
$r->connection->bucket_alloc);
my $len = 0;
# ~ $apr->parse ???
if ($method eq "POST") {
do {
$bb->destroy;
$f->get_brigade($bb, 0, 0, 8000);
} while $bb->last && !$bb->last->is_eos;
}
for ($apr->param) {
$len += length($_) + length($apr->param($_)) + 2; # +2 ('=' and '&')
}
$len--; # the stick with two ends one '&' char off
$apr->content_type('text/plain');
$apr->print($len);
return 0;
}
1;
__END__
1.1 httpd-apreq-2/glue/perl/t/response/TestApReq/cookie.pm
Index: cookie.pm
===================================================================
package TestApReq::cookie;
use strict;
use warnings FATAL => 'all';
use Apache::Test;
use Apache::TestUtil;
use Apache::Cookie ();
use Apache::Request ();
sub handler {
my $r = shift;
my $apr = Apache::Request->new($r);
my %cookies = Apache::Cookie->fetch;
$r->send_http_header('text/plain');
my $test = $apr->param('test');
my $key = $apr->param('key');
# return DECLINED unless defined $test;
if ($test eq 'basic') {
if ($cookies{$key}) {
$r->print($cookies{$key}->value);
}
}
return 0;
}
1;
__END__
1.1 httpd-apreq-2/glue/perl/t/response/TestApReq/inherit.pm
Index: inherit.pm
===================================================================
package TestApReq::inherit;
use strict;
use Apache::Request;
use Apache::Constants qw/OK/;
sub handler {
my $r = Apache->request;
$r->send_http_header('text/plain');
my $apr = Apache::Request->new($r);
printf "method => %s\n", $apr->method;
return OK;
}
1;
1.1 httpd-apreq-2/glue/perl/t/response/TestApReq/request.pm
Index: request.pm
===================================================================
package TestApReq::request;
use strict;
use warnings FATAL => 'all';
use Apache::Test;
use Apache::TestUtil;
use Apache::Constants qw(OK M_POST DECLINED);
use Apache::Request ();
sub handler {
my $r = shift;
my $apr = Apache::Request->new($r);
$r->send_http_header('text/plain');
my $test = $apr->param('test');
my $value = $apr->param('value');
return DECLINED unless defined $test;
if ($test eq 'param') {
$r->print($value);
}
elsif ($test eq 'upload') {
my $upload = $apr->upload;
my $fh = $upload->fh;
local $/;
my $data = <$fh>;
$r->print($data);
}
else {
}
return OK;
}
1;
__END__
1.6 +35 -5 httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h
Index: apreq_xs_postperl.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apreq_xs_postperl.h 7 Jun 2003 19:57:42 -0000 1.5
+++ apreq_xs_postperl.h 9 Jun 2003 04:00:45 -0000 1.6
@@ -8,21 +8,35 @@
#define apreq_xs_table_class ( call_method("table_class", G_SCALAR), \
SvPV_nolen(ST(0)) )
+
APR_INLINE
static XS(apreq_xs_env)
{
dXSARGS;
+ char *class = NULL;
+
+ /* map environment to package */
+
+ if (strcmp(apreq_env, "APACHE2") == 0)
+ class = "Apache::RequestRec";
+
+ /* else if ... add more conditionals here as
+ additional environments become supported */
+
+ if (class == NULL)
+ XSRETURN(0);
if (!SvROK(ST(0))) {
- ST(0) = newSVpv(apreq_env, 0);
+ ST(0) = newSVpv(class, 0);
}
else {
MAGIC *mg;
SV *sv = SvRV(ST(0));
if (SvOBJECT(sv) && (mg = mg_find(sv, PERL_MAGIC_ext))) {
+
ST(0) = sv_2mortal(sv_setref_pv(newSV(0),
- apreq_env, mg->mg_ptr));
+ class, mg->mg_ptr));
}
else
ST(0) = &PL_sv_undef;
@@ -137,7 +151,23 @@
/* requires definition of type##2sv macro */
#define APREQ_XS_DEFINE_GET(type, subtype) \
-static int apreq_xs_##type##_table_do(void *data, const char *key, \
+static int apreq_xs_##type##_table_keys(void *data, const char *key, \
+ const char *val) \
+{ \
+ struct do_arg *d = (struct do_arg *)data; \
+ void *env = d->env; \
+ const char *class = d->class; \
+ dTHXa(d->perl); \
+ dSP; \
+ if (key) \
+ XPUSHs(sv_2mortal(newSVpv(key,0))); \
+ else \
+ XPUSHs(&PL_sv_undef); \
+ \
+ PUTBACK; \
+ return 1; \
+} \
+static int apreq_xs_##type##_table_values(void *data, const char *key, \
const char *val) \
{ \
struct do_arg *d = (struct do_arg *)data; \
@@ -149,7 +179,6 @@
XPUSHs(sv_2mortal(apreq_xs_##subtype##2sv( \
apreq_value_to_##subtype(apreq_strtoval(val)), \
class))); \
- \
else \
XPUSHs(&PL_sv_undef); \
\
@@ -181,7 +210,8 @@
case G_ARRAY: \
XSprePUSH; \
PUTBACK; \
- apr_table_do(apreq_xs_##type##_table_do, &d, t, key, NULL); \
+ apr_table_do(items == 1 ? apreq_xs_##type##_table_keys : \
+ apreq_xs_##type##_table_values, &d, t, key, NULL); \
break; \
\
case G_SCALAR: \
1.3 +4 -1 httpd-apreq-2/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm
Index: Cookie_pm
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cookie_pm 7 Jun 2003 19:57:42 -0000 1.2
+++ Cookie_pm 9 Jun 2003 04:00:45 -0000 1.3
@@ -1,5 +1,8 @@
use strict;
use warnings FATAL => 'all';
+use Apache2;
+use APR;
+use APR::Table;
package Apache::Cookie::Jar;
push our(@ISA), __PACKAGE__ -> env;
@@ -26,7 +29,7 @@
return unless defined $name and defined $value;
my $cookie = $class->make($env, $class->freeze($name, $value));
- $cookie->set_attr(%args);
+ $cookie->set_attr(%attrs);
return $cookie;
}
1.5 +21 -24 httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h
Index: Apache__Request.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Apache__Request.h 7 Jun 2003 19:57:42 -0000 1.4
+++ Apache__Request.h 9 Jun 2003 04:00:45 -0000 1.5
@@ -38,24 +38,6 @@
APREQ_XS_DEFINE_TABLE(request,params);
APREQ_XS_DEFINE_GET(table,param);
-static XS(apreq_xs_params)
-{
- dXSARGS;
- apreq_request_t *req;
- void *env;
-
- if (items != 1)
- Perl_croak(aTHX_ "Usage: $req->params()");
-
- req = apreq_xs_sv2request(ST(0));
- env = req->env;
-
- ST(0) = apreq_xs_table2sv(apreq_params(apreq_env_pool(env),req),
- apreq_xs_table_class);
- XSRETURN(1);
-}
-
-
/* might be used for making upload objects */
@@ -69,12 +51,27 @@
}
#define apreq_xs_rv2param(sv) ((apreq_param_t *)SvIVX(SvRV(sv)))
+#define apreq_xs_param_table_do (items==1 ? apreq_xs_param_table_keys : \
+ apreq_xs_param_table_values)
+static int apreq_xs_param_table_keys(void *data, const char *key,
+ const char *val)
+{
+ struct do_arg *d = (struct do_arg *)data;
+ void *env = d->env;
+ const char *class = d->class;
+ dTHXa(d->perl);
+ dSP;
+ if (val)
+ XPUSHs(sv_2mortal(newSVpv(key, 0)));
+ else
+ XPUSHs(&PL_sv_undef);
-
-
-static int apreq_xs_param_table_do(void *data, const char *key,
- const char *val)
+ PUTBACK;
+ return 1;
+}
+static int apreq_xs_param_table_values(void *data, const char *key,
+ const char *val)
{
struct do_arg *d = (struct do_arg *)data;
void *env = d->env;
@@ -101,7 +98,7 @@
SV *sv = ST(0);
apreq_request_t *req = apreq_xs_sv2request(sv);
void *env = req->env;
- const char *class = apreq_xs_value_class;
+ const char *class = NULL; /* params aren't objects */
struct do_arg d = { class, env, aTHX };
if (items == 2)
@@ -135,5 +132,5 @@
}
}
else
- Perl_croak(aTHX_ "Usage: $table->get($key)");
+ Perl_croak(aTHX_ "Usage: $req->param($key)");
}
1.4 +5 -2 httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Request_pm
Index: Request_pm
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Request_pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Request_pm 7 Jun 2003 20:48:10 -0000 1.3
+++ Request_pm 9 Jun 2003 04:00:45 -0000 1.4
@@ -1,5 +1,8 @@
use strict;
use warnings FATAL => 'all';
+use Apache2;
+use APR;
+use APR::Table;
package Apache::Request::Table;
use base 'APR::Table';
@@ -7,9 +10,9 @@
package Apache::Request;
push our(@ISA), __PACKAGE__ -> env;
-
+sub value_class { undef }
sub table_class { 'Apache::Request::Table' }
-
+sub config {}
sub new {
my $class = shift;
my $env = shift;
1.4 +15 -13 httpd-apreq-2/glue/perl/xsbuilder/maps/apreq_functions.map
Index: apreq_functions.map
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/maps/apreq_functions.map,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apreq_functions.map 7 Jun 2003 19:57:43 -0000 1.3
+++ apreq_functions.map 9 Jun 2003 04:00:45 -0000 1.4
@@ -1,12 +1,18 @@
########## APREQ Functions ##########
-MODULE=Apache::Request PACKAGE=Apache::Request::Table PREFIX=apreq_
- DEFINE_get | apreq_xs_table_table_get |
- DEFINE_FETCH | apreq_xs_table_table_get |
-
-! apreq_make_param
-! apreq_decode_param
-! apreq_encode_param
+MODULE=Apache::Request PACKAGE=Apache::Request PREFIX=apreq_
+ apreq_request | apreq_xs_request | const char *:class, void *:env, const char *:qs=NULL
+ apreq_parse_request
+ apreq_params
+ apreq_param | apreq_xs_param | ...
+
+MODULE=Apache::Request PACKAGE=Apache::Request
+ DEFINE_env | apreq_xs_env | ...
+
+MODULE=Apache::Request PACKAGE=Apache::Request::Table
+ DEFINE_get | apreq_xs_table_table_get | ...
+ DEFINE_FETCH | apreq_xs_table_table_get | ...
+ DEFINE_env | apreq_xs_env | ...
MODULE=Apache::Cookie PACKAGE=Apache::Cookie
SV *:DEFINE_jar | apreq_xs_jar | const char *:class, void *:env, const char *:hdr=NULL
@@ -21,17 +27,13 @@
MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Jar
DEFINE_get | apreq_xs_jar_table_get |
DEFINE_cookies | apreq_xs_jar_cookies |
+ DEFINE_env | apreq_xs_env |
MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Table
DEFINE_get | apreq_xs_table_table_get |
DEFINE_FETCH | apreq_xs_table_table_get |
+ DEFINE_env | apreq_xs_env |
-
-MODULE=Apache::Request PACKAGE=Apache::Request PREFIX=apreq_
- apreq_request | apreq_xs_request | const char *:class, void *:env, const char *:qs=NULL
- apreq_parse_request
- apreq_params
- DEFINE_param | apreq_xs_param |
MODULE=Apache::Request PACKAGE=Apache::Request::Util PREFIX=apreq_
apreq_log
1.9 +2 -2 httpd-apreq-2/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 25 Apr 2003 03:17:48 -0000 1.8
+++ Makefile.am 9 Jun 2003 04:00:46 -0000 1.9
@@ -3,8 +3,8 @@
lib_LTLIBRARIES = libapreq.la
nobase_include_HEADERS = apreq.h apreq_cookie.h apreq_params.h \
- apreq_tables.h apreq_env.h apreq_parsers.h
-libapreq_la_SOURCES = apreq.c apreq_tables.c apreq_cookie.c \
+ apreq_env.h apreq_parsers.h
+libapreq_la_SOURCES = apreq.c apreq_cookie.c \
apreq_params.c apreq_parsers.c
libapreq_la_LDFLAGS = -lapr-0 -laprutil-0 -version-info 2:0
1.9 +1 -1 httpd-apreq-2/t/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/t/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 20 May 2003 20:27:32 -0000 1.8
+++ Makefile.am 9 Jun 2003 04:00:46 -0000 1.9
@@ -2,7 +2,7 @@
LIBS = -L../src
noinst_LIBRARIES = libapreq_tests.a
-libapreq_tests_a_SOURCES = CuTest.c env.c tables.c cookie.c params.c parsers.c performance.c
+libapreq_tests_a_SOURCES = CuTest.c env.c cookie.c params.c parsers.c
libapreq_tests_a_LIBADD = ../src/libapreq.la
check_PROGRAMS = testall
1.8 +2 -2 httpd-apreq-2/t/testall.c
Index: testall.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/t/testall.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testall.c 3 May 2003 05:22:33 -0000 1.7
+++ testall.c 9 Jun 2003 04:00:46 -0000 1.8
@@ -78,11 +78,11 @@
const char *testname;
CuSuite *(*func)(void);
} tests[] = {
- {"tables", testtable},
+// {"tables", testtable},
{"cookies", testcookie},
{"params", testparam},
{"parsers", testparser},
- {"performance", testperformance},
+// {"performance", testperformance},
{"LastTest", NULL}
};