[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r719522 - in /apr/apr-util/branches/1.3.x: build/dbd.m4
From:       wrowe () apache ! org
Date:       2008-11-21 7:16:45
Message-ID: 20081121071645.C24802388852 () eris ! apache ! org
[Download RAW message or body]

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=$$?; \


[prev in list] [next in list] [prev in thread] [next in thread]