summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-03-06 23:23:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:19 -0500
commitf91f57b7496a9929f15f399d1b3bbc989476628d (patch)
treeabce32b883afcb1648298444f020ee5c29adc21a /source4/script
parenteffbda4fd8c648dd9900e5451e04bc8438ac7c73 (diff)
downloadsamba-f91f57b7496a9929f15f399d1b3bbc989476628d.tar.gz
samba-f91f57b7496a9929f15f399d1b3bbc989476628d.tar.bz2
samba-f91f57b7496a9929f15f399d1b3bbc989476628d.zip
r21730: Reintroduce summary for testenv, remove old (no longer used) file.
(This used to be commit 0140aa5fd9e634620d42b8c4cdd4f43c6b681102)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/testenv.pl12
-rwxr-xr-xsource4/script/tests/tests_xterm.sh11
2 files changed, 11 insertions, 12 deletions
diff --git a/source4/script/tests/testenv.pl b/source4/script/tests/testenv.pl
index b290aff542..412fc71dab 100755
--- a/source4/script/tests/testenv.pl
+++ b/source4/script/tests/testenv.pl
@@ -28,5 +28,15 @@ $ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
open(DATA, ">$test_fifo");
Samba4::wait_for_start();
-system("xterm");
+system("xterm -e 'echo -e \"Welcome to the Samba4 Test environment
+This matches the client environment used in make test
+smbd is pid `cat \$PIDDIR/smbd.pid`
+
+Some useful environment variables:
+AUTH=\$AUTH
+TORTURE_OPTIONS=\$TORTURE_OPTIONS
+CONFIGURATION=\$CONFIGURATION
+SERVER=\$SERVER
+NETBIOSNAME=\$NETBIOSNAME\" && bash'");
close(DATA);
+
diff --git a/source4/script/tests/tests_xterm.sh b/source4/script/tests/tests_xterm.sh
deleted file mode 100755
index c6a23316f7..0000000000
--- a/source4/script/tests/tests_xterm.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-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'