diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 06:54:42 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 06:54:42 +0000 |
| commit | f43742b59732461bfb0a829710c215edc5267854 (patch) | |
| tree | 890efe61635f30a140dfd4911c4fc1d30abb6340 | |
| parent | 4848d634fa214c19c4fbfcb5c8350194a029d3f9 (diff) | |
| download | libapr-util-f43742b59732461bfb0a829710c215edc5267854.tar.gz | |
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?
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719512 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/dbd.m4 | 10 | ||||
| -rw-r--r-- | test/Makefile.in | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 415b170e..a63e9ef2 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -520,4 +520,14 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [ 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) ]) diff --git a/test/Makefile.in b/test/Makefile.in index beb06d44..94e75b19 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -61,7 +61,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) 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 "../crypto/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ ./$$prog $$driver; \ status=$$?; \ |