From af7e3dadf9b26cbd817ae5638d37796482694282 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 00:47:48 -0600
Subject: r26561: Fix make gdbtest, valgrindtest and testenv for shared libs.
 (This used to be commit d2b9055bc032506849827d6fab2d2b9d35d132e2)

---
 source4/selftest/config.mk       | 12 ++++++------
 source4/selftest/selftest.pl     |  3 +--
 source4/selftest/test_subunit.pl |  7 +++++++
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100755 source4/selftest/test_subunit.pl

(limited to 'source4/selftest')

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index d8b886a6dc..0d5f4d6ab4 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -37,32 +37,32 @@ testenv: everything
 valgrindtest: valgrindtest-all
 
 valgrindtest-quick: all
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-all: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-env: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --socket-wrapper --testenv
 
 gdbtest: gdbtest-all
 
 gdbtest-quick: all
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
 
 gdbtest-all: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) --immediate --socket-wrapper $(TESTS)
 
 gdbtest-env: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) --socket-wrapper --testenv
 
 wintest: all
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 7401205041..96409558b1 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -539,7 +539,6 @@ sub write_clientconf($$)
 	close(CF);
 }
 
-
 my @torture_options = ();
 push (@torture_options, "--configfile=$conffile");
 # ensure any one smbtorture call doesn't run too long
@@ -769,7 +768,7 @@ TORTURE_OPTIONS=\$TORTURE_OPTIONS
 CONFIGURATION=\$CONFIGURATION
 
 $envvarstr
-\" && bash'");
+\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
 	teardown_env($testenv_name);
 } else {
 	foreach (@todo) {
diff --git a/source4/selftest/test_subunit.pl b/source4/selftest/test_subunit.pl
new file mode 100755
index 0000000000..28522ed49f
--- /dev/null
+++ b/source4/selftest/test_subunit.pl
@@ -0,0 +1,7 @@
+#!/usr/bin/perl
+
+use Test::More tests => 0;
+use FindBin qw($RealBin);
+use lib $RealBin;
+use Subunit qw(parse_results);
+
-- 
cgit