summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2005-06-06 14:23:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:44 -0500
commit198241adc21657f59e58de4a053a1e2218f05234 (patch)
treeedae9b01d7876f2b39118ffa823fd35f65e35db7
parentbd1dc11f04f1873093712be27b84ebe319f3b267 (diff)
downloadsamba-198241adc21657f59e58de4a053a1e2218f05234.tar.gz
samba-198241adc21657f59e58de4a053a1e2218f05234.tar.bz2
samba-198241adc21657f59e58de4a053a1e2218f05234.zip
r7338: let it be possible to run sqlite3 tests when it is compiled in
make it also so that we do not run test for modules we do not compile in (This used to be commit c226c1c7a393b398510dec0931aba2ddd09af4c3)
-rw-r--r--source4/lib/ldb/Makefile.in16
-rwxr-xr-xsource4/lib/ldb/tests/test-sqlite3.sh9
-rwxr-xr-xsource4/lib/ldb/tests/test-tdb.sh4
3 files changed, 26 insertions, 3 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index ebeb9e1be0..648e3074c6 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -119,15 +119,29 @@ test-tdb:
@echo "STARTING TDB BACKEND TEST"
tests/test-tdb.sh
+ifeq ($(WITH_LDAP),yes)
test-ldap:
@echo "STARTING LDAP BACKEND TEST"
tests/test-ldap.sh
+else
+test-ldap:
+ @echo "SKIP LDAP TEST - NO LDAP SUPPORT"
+endif
+
+ifeq ($(WITH_SQLITE3),yes)
+test-sqlite3:
+ @echo "STARTING SQLITE3 BACKEND TEST"
+ tests/test-sqlite3.sh
+else
+test-sqlite3:
+ @echo "SKIP SQLITE3 TEST - NO SQLITE3 SUPPORT"
+endif
test-schema:
@echo "STARTING SCHEMA MODULE TEST"
tests/test-schema.sh
-test: test-tdb test-ldap test-schema
+test: test-tdb test-ldap test-sqlite3 test-schema
install: all
cp include/ldb.h $(includedir)
diff --git a/source4/lib/ldb/tests/test-sqlite3.sh b/source4/lib/ldb/tests/test-sqlite3.sh
new file mode 100755
index 0000000000..cf443bb8a1
--- /dev/null
+++ b/source4/lib/ldb/tests/test-sqlite3.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+
+export LDB_URL="sqlite://sqltest.ldb"
+
+rm -f sqltest.ldb
+
+. tests/test-generic.sh
+
diff --git a/source4/lib/ldb/tests/test-tdb.sh b/source4/lib/ldb/tests/test-tdb.sh
index 316828c31c..69b30a50b4 100755
--- a/source4/lib/ldb/tests/test-tdb.sh
+++ b/source4/lib/ldb/tests/test-tdb.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-export LDB_URL="tdb://test.ldb"
+export LDB_URL="tdb://tdbtest.ldb"
-rm -f test.ldb
+rm -f tdbtest.ldb
. tests/test-generic.sh