X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2FMakefile.in;h=05f99d66d7c43fac17a93508bef4bd026ca767b6;hb=69adde23289dd6aff7cbfad8cf45e652d710879c;hp=b0626ca9d6eb9e4e8f190c01a443c3d27a27b301;hpb=39f0066db488364aefb67164e8d4671b487835e1;p=openldap

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b0626ca9d6..05f99d66d7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,58 +1,67 @@
-## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+# Makefile.in for tests
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## tests Makefile.in for OpenLDAP
-BUILD_BDB2 = @BUILD_BDB2@
+## Copyright 1998-2005 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
-SRC      = slapd-tester.c slapd-search.c
-PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel
+RUN=./run
+SUBDIRS= progs
 
-LDAP_INCDIR= ../include
-LDAP_LIBDIR= ../libraries
+BUILD_BDB=@BUILD_BDB@
+BUILD_HDB=@BUILD_HDB@
+BUILD_LDBM=@BUILD_LDBM@
+BUILD_SQL=@BUILD_SQL@
 
-XLIBS    = -lldap_r -llber -llutil
+test tests:
+	@$(MAKE) bdb
+	@$(MAKE) hdb
+	@$(MAKE) ldbm
+	@$(MAKE) sql
 
-build-tools: FORCE
-	$(MAKE) $(MFLAGS) load-tools
+bdb test-bdb:	bdb-$(BUILD_BDB)
+bdb-no:
+	@echo "run configure with --enable-bdb to run BDB tests"
 
-load-tools: $(PROGRAMS)
+bdb-yes bdb-mod: FORCE
+	@echo "Initiating LDAP tests for BDB..."
+	@$(RUN) -b bdb all
 
-slapd-tester: slapd-tester.o 
-	$(LTLINK) -o $@ slapd-tester.o
+hdb test-hdb:	hdb-$(BUILD_HDB)
+hdb-no:
+	@echo "run configure with --enable-hdb to run HDB tests"
 
-slapd-search: slapd-search.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-search.o $(LDAP_LIBPATH) $(XLIBS)
+hdb-yes hdb-mod: FORCE
+	@echo "Initiating LDAP tests for HDB..."
+	@$(RUN) -b hdb all
 
-slapd-read: slapd-read.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-read.o $(LDAP_LIBPATH) $(XLIBS)
+ldbm test-ldbm:	ldbm-$(BUILD_LDBM)
+ldbm-no:
+	@echo "run configure with --enable-ldbm to run LDBM tests"
 
-slapd-addel: slapd-addel.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-addel.o $(LDAP_LIBPATH) $(XLIBS)
+ldbm-yes ldbm-mod:	FORCE
+	@echo "Initiating LDAP tests for LDBM..."
+	@$(RUN) -b ldbm all
 
-bdb2-local:	build-tools FORCE
-	@if test "$(BUILD_BDB2)" = "yes" ; then \
-		$(LN_S) $(srcdir)/data . ; \
-		echo "Initiating LDAP tests..." ; \
-		$(MKDIR) test-db test-repl ; \
-		$(srcdir)/scripts/all $(srcdir) bdb2 ; \
-	else \
-		echo "run configure with --enable-bdb2" ; \
-	fi
+sql test-sql:	sql-$(BUILD_SQL)
+sql-no:
+	@echo "run configure with --enable-sql to run SQL tests"
 
-all-local:	build-tools FORCE
-	@-$(LN_S) $(srcdir)/data .
-	@echo "Initiating LDAP tests..."; \
-	$(MKDIR) test-db test-repl ; \
-	$(srcdir)/scripts/all $(srcdir) ldbm
+sql-yes sql-mod:	FORCE
+	@echo "Initiating LDAP tests for SQL..."
+	@$(RUN) -b sql sql-all
 
 clean-local:	FORCE
-	$(RM) test-db/[!C]* test-repl/[!C]* *core
-	$(RM) $(PROGRAMS)
-	$(RM) *.o
+	-$(RM) -r testrun *leak *gmon *core
 
 veryclean-local: FORCE
-	@-$(RM) data
-	$(RM) -r test-db test-repl
-	$(RM) $(PROGRAMS)
-	$(RM) *.o
+	@-$(RM) run data schema ucdata