From 6bc9fb887fa685a595b019c5ad6fc77f2fa3e914 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 28 Oct 2008 12:20:59 +0100 Subject: [PATCH] selftest: move gdb_* and valgrind_* scripts to selftest/ metze --- {source4/script => selftest}/gdb_backtrace | 0 {source4/script => selftest}/gdb_backtrace_test.c | 0 {source4/script => selftest}/gdb_run | 0 selftest/selftest.pl | 2 +- selftest/target/Samba4.pm | 2 +- {source4/script => selftest}/valgrind_run | 0 source4/selftest/config.mk | 13 +++++++------ 7 files changed, 9 insertions(+), 8 deletions(-) rename {source4/script => selftest}/gdb_backtrace (100%) rename {source4/script => selftest}/gdb_backtrace_test.c (100%) rename {source4/script => selftest}/gdb_run (100%) rename {source4/script => selftest}/valgrind_run (100%) diff --git a/source4/script/gdb_backtrace b/selftest/gdb_backtrace similarity index 100% rename from source4/script/gdb_backtrace rename to selftest/gdb_backtrace diff --git a/source4/script/gdb_backtrace_test.c b/selftest/gdb_backtrace_test.c similarity index 100% rename from source4/script/gdb_backtrace_test.c rename to selftest/gdb_backtrace_test.c diff --git a/source4/script/gdb_run b/selftest/gdb_run similarity index 100% rename from source4/script/gdb_run rename to selftest/gdb_run diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 2484bd06876..aa99b2ed6fb 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -573,7 +573,7 @@ sub write_clientconf($$) print CF " private dir = $prefix_abs/client/private name resolve order = bcast - panic action = $srcdir_abs/script/gdb_backtrace \%PID\% \%PROG\% + panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\% max xmit = 32K notify:inotify = false ldb:nosync = true diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 9364008ee2f..8c79a314488 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -562,7 +562,7 @@ sub provision($$$$$$) name resolve order = bcast interfaces = $interfaces tls dh params file = $tlsdir/dhparms.pem - panic action = $srcdir/script/gdb_backtrace \%PID% \%PROG% + panic action = $RealBin/gdb_backtrace \%PID% \%PROG% wins support = yes server role = $server_role max xmit = 32K diff --git a/source4/script/valgrind_run b/selftest/valgrind_run similarity index 100% rename from source4/script/valgrind_run rename to selftest/valgrind_run diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 43c5855d3ae..c5f7c5adb43 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -58,30 +58,31 @@ test-%:: valgrindtest:: valgrindtest-all valgrindtest-quick:: all - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ $(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS) valgrindtest-all:: everything - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS) valgrindtest-env:: everything - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv gdbtest:: gdbtest-all gdbtest-quick:: all - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ $(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS) gdbtest-all:: everything - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS) gdbtest-env:: everything - SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \ + SMBD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv + -- 2.34.1