r18829: Print a nice welcome message when we enter the test environment.

Andrew Bartlett
(This used to be commit 77f1c15d92d13f6e4f278d9d4b0f15fab66b4bbc)

diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index e8f3dcff6e4ce39e8aa5d6579c3626ae66f48cd0..b4090eee7b3cbc83905f41b0beffa2cf3ea99bf2 100755 (executable)
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -67,6 +67,8 @@ export CONFFILE
 export SLAPD_CONF
 export PIDDIR
 export AUTH
+export SERVER
+export NETBIOSNAME
 
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR $LDAPDIR/db

diff --git a/source4/script/tests/tests_xterm.sh b/source4/script/tests/tests_xterm.sh
index 30ba44e1a089deb6ca86561b4867a9e3f1c2a66b..c6a23316f70ea8b9b441d108cc24f14070ef6d28 100644 (file)
--- a/source4/script/tests/tests_xterm.sh
+++ b/source4/script/tests/tests_xterm.sh
@@ -1,2 +1,11 @@
 #!/bin/sh
-xterm
+xterm -e 'echo -e "Welcome to the Samba4 Test environment\n\
+This matches the client environment used in make test\n\
+smbd is pid `cat $PIDDIR/smbd.pid`\n\
+\n\
+Some useful environment variables:\n\
+AUTH=$AUTH\n\
+TORTURE_OPTIONS=$TORTURE_OPTIONS\n\
+CONFIGURATION=$CONFIGURATION\n\
+SERVER=$SERVER\n\
+NETBIOSNAME=$NETBIOSNAME" && bash'