svn commit: samba r26561 - in branches/SAMBA_4_0: . source/script source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-22 00:47:48 +0000 (Sat, 22 Dec 2007)
New Revision: 26561

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26561

Log:
Fix make gdbtest, valgrindtest and testenv for shared libs.
Added:
   branches/SAMBA_4_0/source/selftest/test_subunit.pl
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/gdb_run
   branches/SAMBA_4_0/source/script/valgrind_run
   branches/SAMBA_4_0/source/selftest/config.mk
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/script/gdb_run
===================================================================
--- branches/SAMBA_4_0/source/script/gdb_run	2007-12-22 00:47:44 UTC (rev 26560)
+++ branches/SAMBA_4_0/source/script/gdb_run	2007-12-22 00:47:48 UTC (rev 26561)
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+ENV="$1"
+
+shift 1
+
 if test -z "$TMPDIR"; then
 	TMPDIR="/tmp"
 fi
@@ -13,4 +17,4 @@
 trap "/bin/rm -f $TMPFILE" EXIT
 CMD="gdb -x $TMPFILE --args $@"
 echo $CMD
-eval "$CMD"
+eval $ENV "$CMD"

Modified: branches/SAMBA_4_0/source/script/valgrind_run
===================================================================
--- branches/SAMBA_4_0/source/script/valgrind_run	2007-12-22 00:47:44 UTC (rev 26560)
+++ branches/SAMBA_4_0/source/script/valgrind_run	2007-12-22 00:47:48 UTC (rev 26561)
@@ -1,2 +1,7 @@
 #!/bin/sh
-valgrind -q --db-attach=yes --num-callers=30 $@
+
+ENV="$1"
+
+shift 1
+
+$ENV valgrind -q --db-attach=yes --num-callers=30 $@

Modified: branches/SAMBA_4_0/source/selftest/config.mk
===================================================================
--- branches/SAMBA_4_0/source/selftest/config.mk	2007-12-22 00:47:44 UTC (rev 26560)
+++ branches/SAMBA_4_0/source/selftest/config.mk	2007-12-22 00:47:48 UTC (rev 26561)
@@ -37,32 +37,32 @@
 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

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-22 00:47:44 UTC (rev 26560)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-22 00:47:48 UTC (rev 26561)
@@ -539,7 +539,6 @@
 	close(CF);
 }
 
-
 my @torture_options = ();
 push (@torture_options, "--configfile=$conffile");
 # ensure any one smbtorture call doesn't run too long
@@ -769,7 +768,7 @@
 CONFIGURATION=\$CONFIGURATION
 
 $envvarstr
-\" && bash'");
+\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
 	teardown_env($testenv_name);
 } else {
 	foreach (@todo) {

Added: branches/SAMBA_4_0/source/selftest/test_subunit.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_subunit.pl	2007-12-22 00:47:44 UTC (rev 26560)
+++ branches/SAMBA_4_0/source/selftest/test_subunit.pl	2007-12-22 00:47:48 UTC (rev 26561)
@@ -0,0 +1,7 @@
+#!/usr/bin/perl
+
+use Test::More tests => 0;
+use FindBin qw($RealBin);
+use lib $RealBin;
+use Subunit qw(parse_results);
+


Property changes on: branches/SAMBA_4_0/source/selftest/test_subunit.pl
___________________________________________________________________
Name: svn:executable
   + *