diff options
| -rwxr-xr-x | source4/script/tests/testenv.pl | 12 | ||||
| -rwxr-xr-x | source4/script/tests/tests_xterm.sh | 11 |
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' |