From 1d2afdcfb74475ac09076d049c7e362ba17616e5 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 19 Mar 2003 03:55:14 +0000
Subject: Get rid of "make check" targets that call nonexistent code.

Add in new ones that run STF, after setting up a PATH and
LD_LIBRARY_PATH that will let them find samba in the build directory.

LD_LIBRARY_PATH is probably not portable but without libtool I don't
know a portable way to do it.  Perhaps the simple solution is just to
link these things statically?
(This used to be commit 27c1626ae0a30bf0f01ea6d6df5836425e6f9547)
---
 source3/Makefile.in | 45 +++++++++++++++------------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8d7276b240..6964a2bc82 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1260,33 +1260,18 @@ config.status: $(srcdir)/configure
 Makefile: $(srcdir)/Makefile.in config.status
 	@echo "WARNING: you need to run ./config.status"
 
-test_prefix=/tmp/test-samba
-# Run regression suite using the external "satyr" framework
-check:
-	@echo "** Sorry, samba self-test without installation does not work "
-	@echo "** yet.  Please try specifying a scratch directory to"
-	@echo "**       ./configure --prefix DIR"
-	@echo "** then run \"make install installcheck\""
-	exit 1
-
-# 	-rm -rf $(test_prefix)/lib
-# 	mkdir $(test_prefix)/lib -p ./testdir 
-# 	PATH=$(builddir)/bin:$(PATH) \
-# 	SATYR_SUITEDIR=../testsuite/build_farm/ prefix=$(test_prefix) \
-# 	testdir=./testdir $(SHELL) satyr
-
-# Run regression suite on the installed version.
-
-# `installcheck'
-#      Perform installation tests (if any).  The user must build and
-#      install the program before running the tests.  You should not
-#      assume that `$(bindir)' is in the search path.
-
-dangerous-installcheck:
-	mkdir -p $(BASEDIR)/lib
-	mkdir -p $(BASEDIR)/var
-	PATH=$(BINDIR):$(SBINDIR):$(PATH) \
-	SATYR_DISCOURAGE=1 \
-	SATYR_SUITEDIR=../testsuite/satyr/ prefix=$(BASEDIR) \
-	LIBSMB_PROG=$(SBINDIR)/smbd \
-	testdir=./testdir $(SHELL) satyr
+######################################################################
+# Samba Testing Framework
+
+# FIXME: LD_LIBRARY_PATH is not portable, but in the absence of
+# libtool I don't know a better way to do it.  Perhaps we should fix
+# libbigballofmud to link statically?
+
+check: check-programs
+	LD_LIBRARY_PATH="`pwd`/bin:$$LD_LIBRARY_PATH" \
+	PATH="`pwd`/bin:$$PATH" \
+	python stf/standardcheck.py
+
+# These are called by the test suite
+check-programs: bin/t_strcmp
+
-- 
cgit