]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
TestBed: Polish the tests slightly and enable per-run level of tests
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 2 Jul 2009 11:38:56 +0000 (23:38 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 2 Jul 2009 11:38:56 +0000 (23:38 +1200)
This finished the planned testbed features. Each level of test can now
be run on any combination of make targets specific to that test.

Remove the make all output used by obsolete testbed algorithms.

Makefile.am
test-suite/buildtest.sh
test-suite/buildtests/layer-00-default.opts
test-suite/buildtests/layer-01-minimal.opts
test-suite/buildtests/layer-02-maximus.opts
test-suite/buildtests/os-debian.opts
test-suite/buildtests/os-mingw.opts
test-suite/buildtests/os-ubuntu.opts

index 861988a60a08af17e75a4b851af485456824b63a..061ed3128867e7df4eb84e3bd1ed7078a1cb5517 100644 (file)
@@ -40,6 +40,3 @@ EXTRA_DIST = \
 install-pinger:
        chown root $(DESTDIR)$(DEFAULT_PINGER)
        chmod 4711 $(DESTDIR)$(DEFAULT_PINGER)
-
-all-am:
-       @echo "Build Successful."
index 873dbf85b22a428f4c76564903cb1f3b8f6a1903..7d1875616b4a287251a570660e4b0fa9aa294271 100755 (executable)
@@ -39,8 +39,7 @@ fi
 # do not build any of the install's ...
 rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps &&
        $base/../configure --silent ${OPTS} 2>&1 &&
-       make ${pjobs} check 2>&1 &&
-       make ${pjobs} 2>&1
+       make ${pjobs} ${MAKETEST} 2>&1
 
 # Remember and then explicitly return the result of the last command
 # to the script caller. Probably not needed on most or all platforms.
index 5f4d232ef09ffc9c09a606979947b48722056d96..74779fcfc795e705cbeaec57d5f222339fe54709 100644 (file)
@@ -1,4 +1,8 @@
 #
+#
+# Complete Check - everything MUST work at this level
+MAKETEST="distcheck"
+#
 # Default configuration options.
 #  - Nothing special configured. Just whatever is found by "./configure"
 #
index ed7190e4cba1cf79fa112d0d1c59f5730f444914..b41103ad6f4123d80d770f102e012371f445d263 100644 (file)
@@ -3,6 +3,11 @@
 # - Everthing that can be disabled is
 # - Everyhing that can be done without is 
 #
+#
+# Complete Check - everything MUST work at this level
+MAKETEST="distcheck"
+#
+#
 # The options for this level can be easily generated semi-automatically from configure.in by:
 #      grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --disable-' and '\' strings
index a0d6cd012c918c7efe6dbef656afa51a047b8b99..d74486671da481c87cb48b092c6cfaca67c46934 100644 (file)
@@ -3,6 +3,11 @@
 # XXX: with the exception of those that depend on the environment.
 # TODO: Add environment-specific tests to enable more options.
 #
+#
+# Complete Check - everything is supposed to work at this level
+MAKETEST="distcheck"
+#
+#
 # The options for this level can be easily generated semi-automatically from configure.in by:
 #      grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --enable-' and '\' strings
index a5280acc17b97ae008a4490f526c21516a6d1865..f5a99d7d0955fa1b7dcd67fbd463f0b7b83b88a2 100644 (file)
@@ -1,8 +1,11 @@
 #!/bin/sh
 #
+MAKETEST="check installcheck uninstallcheck"
+#
+#
 # Configure options currently used by Debian Packaged Release
 #
-# This is to test any release build against what the package maintainers are seeing
+# This is to test any release build against what the package maintainers are seing
 #
 OPTS=" \
        --build=i486-linux-gnu \
@@ -13,13 +16,16 @@ OPTS=" \
        --sysconfdir=/etc \
        --localstatedir=/var \
        --libexecdir="\${prefix}/lib/squid3" \
-       --disable-maintainer-mode \
-       --disable-dependency-tracking \
        --srcdir=. \
        --datadir=/usr/share/squid3 \
        --sysconfdir=/etc/squid3 \
        --mandir=/usr/share/man \
        --with-cppunit-basedir=/usr \
+       --with-default-user=proxy \
+ \
+       --disable-maintainer-mode \
+       --disable-dependency-tracking \
+       --disable-loadable-modules \
        --enable-inline \
        --enable-async-io=8 \
        --enable-storeio="ufs,aufs,coss,diskd,null" \
@@ -40,7 +46,6 @@ OPTS=" \
        --enable-digest-auth-helpers="ldap,password" \
        --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
        --with-filedescriptors=65536 \
-       --with-default-user=proxy \
        --enable-epoll \
        --enable-linux-netfilter \
 "
index f0867bdb793fb15b4c4acfcdf082536a589021ef..0897943f6d44f79b837adf8b89630c2565408724 100644 (file)
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+MAKETEST="check installcheck uninstallcheck"
+#
+#
 # Configure options currently supported by MinGW environment
 #
 OPTS=" \
index ab6d839a0de4e059d958d6e8dd9c1ac10bda6a80..90ce9e4a63cbadde8e1677f7ffe28a637512f9f5 100644 (file)
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+MAKETEST="check installcheck uninstallcheck"
+#
 # Configure options currently used by Ubuntu Packaged Release
 #
 # This is to test any release build against what the package maintainers are seeing
@@ -13,13 +15,15 @@ OPTS=" \
        --sysconfdir=/etc \
        --localstatedir=/var \
        --libexecdir="\${prefix}/lib/squid3" \
-       --disable-maintainer-mode \
-       --disable-dependency-tracking \
        --srcdir=. \
        --datadir=/usr/share/squid3 \
        --sysconfdir=/etc/squid3 \
        --mandir=/usr/share/man \
        --with-cppunit-basedir=/usr \
+       --with-default-user=proxy \
+ \
+       --disable-maintainer-mode \
+       --disable-dependency-tracking \
        --enable-inline \
        --enable-async-io=8 \
        --enable-storeio="ufs,aufs,coss,diskd,null" \
@@ -40,7 +44,6 @@ OPTS=" \
        --enable-digest-auth-helpers="ldap,password" \
        --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
        --with-filedescriptors=65536 \
-       --with-default-user=proxy \
        --enable-epoll \
        --enable-linux-netfilter \
 "