summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-22 20:00:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:19:15 -0500
commit266ba2222b7eebe426db626acd6fcd109eef429a (patch)
treeafaa9652449e373ea7abd97bab58690f30224769
parentc220ef880d9585d16efb547125008bb870777029 (diff)
downloadsamba-266ba2222b7eebe426db626acd6fcd109eef429a.tar.gz
samba-266ba2222b7eebe426db626acd6fcd109eef429a.tar.bz2
samba-266ba2222b7eebe426db626acd6fcd109eef429a.zip
r18829: Print a nice welcome message when we enter the test environment.
Andrew Bartlett (This used to be commit 77f1c15d92d13f6e4f278d9d4b0f15fab66b4bbc)
-rwxr-xr-xsource4/script/tests/mktestsetup.sh2
-rw-r--r--source4/script/tests/tests_xterm.sh11
2 files changed, 12 insertions, 1 deletions
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index e8f3dcff6e..b4090eee7b 100755
--- 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 30ba44e1a0..c6a23316f7 100644
--- 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'