github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some reorg of regression tests.

Browse Source
This commit is contained in:
brectanus 2008-05-27 19:08:51 +00:00
parent 49e63a3e30
commit 4bc1fc39f0
6 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apache2/configure vendored
View File

@ -684,6 +684,11 @@ APXS_LIBS
APXS_CFLAGS
APXS_LIBTOOL
APXS_CC
APXS_LIBDIR
APXS_BINDIR
APXS_SBINDIR
APXS_PROGNAME
APXS_HTTPD
PCRE_LIBS
PCRE_CFLAGS
APR_LIBS
@ -5071,6 +5076,14 @@ rm -f conftest*
fi
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
APXS_CC="`$APXS -q CC`"
APXS_BINDIR="`$APXS -q BINDIR`"
APXS_SBINDIR="`$APXS -q SBINDIR`"
APXS_PROGNAME="`$APXS -q PROGNAME`"
if test "$APXS_SBINDIR" = "/"; then
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
else
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
fi
else
{ { echo "$as_me:$LINENO: error: couldn't find APXS" >&5
echo "$as_me: error: couldn't find APXS" >&2;}
@ -5287,6 +5300,11 @@ LDFLAGS="$APXS_LDFLAGS $LDFLAGS"
# Check whether --with-pcre was given.
@ -6438,6 +6456,11 @@ APXS_LIBS!$APXS_LIBS$ac_delim
APXS_CFLAGS!$APXS_CFLAGS$ac_delim
APXS_LIBTOOL!$APXS_LIBTOOL$ac_delim
APXS_CC!$APXS_CC$ac_delim
APXS_LIBDIR!$APXS_LIBDIR$ac_delim
APXS_BINDIR!$APXS_BINDIR$ac_delim
APXS_SBINDIR!$APXS_SBINDIR$ac_delim
APXS_PROGNAME!$APXS_PROGNAME$ac_delim
APXS_HTTPD!$APXS_HTTPD$ac_delim
PCRE_LIBS!$PCRE_LIBS$ac_delim
PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
APR_LIBS!$APR_LIBS$ac_delim
@ -6457,7 +6480,7 @@ CURL_CFLAGS!$CURL_CFLAGS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13
apache2/configure.in
View File

@ -107,6 +107,14 @@ VERSION_OK
fi
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
APXS_CC="`$APXS -q CC`"
APXS_BINDIR="`$APXS -q BINDIR`"
APXS_SBINDIR="`$APXS -q SBINDIR`"
APXS_PROGNAME="`$APXS -q PROGNAME`"
if test "$APXS_SBINDIR" = "/"; then
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
else
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
fi
else
AC_MSG_ERROR(couldn't find APXS)
fi
@ -263,6 +271,11 @@ AC_SUBST(APXS_LIBS)
AC_SUBST(APXS_CFLAGS)
AC_SUBST(APXS_LIBTOOL)
AC_SUBST(APXS_CC)
AC_SUBST(APXS_LIBDIR)
AC_SUBST(APXS_BINDIR)
AC_SUBST(APXS_SBINDIR)
AC_SUBST(APXS_PROGNAME)
AC_SUBST(APXS_HTTPD)
CHECK_PCRE()
CHECK_APR()

0
apache2/t/regression/config/00-audit-directives.t → apache2/t/regression/config/10-audit-directives.t
View File

0
apache2/t/regression/config/00-debug-directives.t → apache2/t/regression/config/10-debug-directives.t
View File

1
apache2/t/regression/config/10-misc-directives.t Normal file
View File

@ -0,0 +1 @@
### Misc directive tests

14
apache2/t/run-regression-tests.pl.in
View File

@ -73,8 +73,8 @@ EOT
usage() if ($opt{h});
### Check startup script
$opt{a} = "httpd" unless (defined $opt{a});
### Check httpd binary
$opt{a} = "@APXS_HTTPD@" unless (defined $opt{a});
usage("Invalid Apache startup script: $opt{a}\n") unless (-e $opt{a});
### Defaults
@ -85,6 +85,11 @@ $opt{C} = "$CONF_DIR/httpd.conf" unless (defined $opt{C});
$opt{H} = "$SROOT_DIR/htdocs" unless (defined $opt{H});
$opt{p} = 8088 unless (defined $opt{p});
unless (defined $opt{S}) {
my $httpd_root = `$opt{a} -V`;
($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
}
%ENV = (
%ENV,
SERVER_ROOT => $opt{S},
@ -103,11 +108,6 @@ $opt{p} = 8088 unless (defined $opt{p});
USER_AGENT => $UA_NAME,
);
unless (defined $opt{S}) {
my $httpd_root = `$opt{a} -V`;
($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
}
dbg("OPTIONS: ", \%opt);
if (-e "$PID_FILE") {