From: Amos Jeffries Date: Thu, 2 Jul 2009 11:38:56 +0000 (+1200) Subject: TestBed: Polish the tests slightly and enable per-run level of tests X-Git-Tag: SQUID_3_2_0_1~916 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b985c04a87f91d6dd83cf428d6217dfca0799e0;p=thirdparty%2Fsquid.git TestBed: Polish the tests slightly and enable per-run level of tests 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. --- diff --git a/Makefile.am b/Makefile.am index 861988a60a..061ed31288 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,3 @@ EXTRA_DIST = \ install-pinger: chown root $(DESTDIR)$(DEFAULT_PINGER) chmod 4711 $(DESTDIR)$(DEFAULT_PINGER) - -all-am: - @echo "Build Successful." diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh index 873dbf85b2..7d1875616b 100755 --- a/test-suite/buildtest.sh +++ b/test-suite/buildtest.sh @@ -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. diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts index 5f4d232ef0..74779fcfc7 100644 --- a/test-suite/buildtests/layer-00-default.opts +++ b/test-suite/buildtests/layer-00-default.opts @@ -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" # diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts index ed7190e4cb..b41103ad6f 100644 --- a/test-suite/buildtests/layer-01-minimal.opts +++ b/test-suite/buildtests/layer-01-minimal.opts @@ -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 diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts index a0d6cd012c..d74486671d 100644 --- a/test-suite/buildtests/layer-02-maximus.opts +++ b/test-suite/buildtests/layer-02-maximus.opts @@ -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 diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts index a5280acc17..f5a99d7d09 100644 --- a/test-suite/buildtests/os-debian.opts +++ b/test-suite/buildtests/os-debian.opts @@ -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 \ " diff --git a/test-suite/buildtests/os-mingw.opts b/test-suite/buildtests/os-mingw.opts index f0867bdb79..0897943f6d 100644 --- a/test-suite/buildtests/os-mingw.opts +++ b/test-suite/buildtests/os-mingw.opts @@ -1,5 +1,8 @@ #!/bin/sh # +MAKETEST="check installcheck uninstallcheck" +# +# # Configure options currently supported by MinGW environment # OPTS=" \ diff --git a/test-suite/buildtests/os-ubuntu.opts b/test-suite/buildtests/os-ubuntu.opts index ab6d839a0d..90ce9e4a63 100644 --- a/test-suite/buildtests/os-ubuntu.opts +++ b/test-suite/buildtests/os-ubuntu.opts @@ -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 \ "