From commits-return-10008-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Nov 21 07:17:15 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 85418 invoked from network); 21 Nov 2008 07:17:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Nov 2008 07:17:15 -0000 Received: (qmail 5018 invoked by uid 500); 21 Nov 2008 07:17:24 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 4926 invoked by uid 500); 21 Nov 2008 07:17:24 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 4917 invoked by uid 99); 21 Nov 2008 07:17:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2008 23:17:24 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2008 07:16:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C24802388852; Thu, 20 Nov 2008 23:16:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r719522 - in /apr/apr-util/branches/1.3.x: build/dbd.m4 test/Makefile.in Date: Fri, 21 Nov 2008 07:16:45 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081121071645.C24802388852@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Thu Nov 20 23:16:45 2008 New Revision: 719522 URL: http://svn.apache.org/viewvc?rev=719522&view=rev Log: Prepare to invoke all available tests; we obviously need a DB open in these cases. Perhaps a standardized naming convention of apu_dbd_test or something? Backports: 719512 Modified: apr/apr-util/branches/1.3.x/build/dbd.m4 apr/apr-util/branches/1.3.x/test/Makefile.in Modified: apr/apr-util/branches/1.3.x/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbd.m4?rev=719522&r1=719521&r2=719522&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/build/dbd.m4 (original) +++ apr/apr-util/branches/1.3.x/build/dbd.m4 Thu Nov 20 23:16:45 2008 @@ -520,4 +520,14 @@ LIBS="$old_libs" CPPFLAGS="$old_cppflags" LDFLAGS="$old_ldflags" + + apu_dbd_tests="" + test $apu_have_oracle = 1 && apu_dbd_tests="$apu_dbd_tests oracle" + test $apu_have_pgsql = 1 && apu_dbd_tests="$apu_dbd_tests pgsql" + test $apu_have_mysql = 1 && apu_dbd_tests="$apu_dbd_tests mysql" + test $apu_have_sqlite2 = 1 && apu_dbd_tests="$apu_dbd_tests sqlite2" + test $apu_have_sqlite3 = 1 && apu_dbd_tests="$apu_dbd_tests sqlite3" + test $apu_have_freetds = 1 && apu_dbd_tests="$apu_dbd_tests freetds" + test $apu_have_odbc = 1 && apu_dbd_tests="$apu_dbd_tests odbc" + AC_SUBST(apu_dbd_tests) ]) Modified: apr/apr-util/branches/1.3.x/test/Makefile.in URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/Makefile.in?rev=719522&r1=719521&r2=719522&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/test/Makefile.in (original) +++ apr/apr-util/branches/1.3.x/test/Makefile.in Thu Nov 20 23:16:45 2008 @@ -61,7 +61,7 @@ progfailed=""; \ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ if test "$$prog" = 'dbd'; then \ - for driver in sqlite2 sqlite3; do \ + for driver in @apu_dbd_tests@; do \ @apr_shlibpath_var@="`echo "../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ ./$$prog $$driver; \ status=$$?; \