summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2013-01-03 14:33:45 -0800
committerAndrew Bartlett <abartlet@samba.org>2013-01-22 13:03:52 +0100
commit9aca52877a3f6f59887098ebb8e664922c8c7aad (patch)
treececa5a79f779dc3188f29f3e60356c57c4ab9bc6
parentb1e231384a9245a191ef5e004544d7cafe17e036 (diff)
downloadsamba-9aca52877a3f6f59887098ebb8e664922c8c7aad.tar.gz
samba-9aca52877a3f6f59887098ebb8e664922c8c7aad.tar.bz2
samba-9aca52877a3f6f59887098ebb8e664922c8c7aad.zip
Tests: Fix the display of test vars in screen --testenv
The form bash -c echo "important stuff blabla bla" && LD_LIBARY_PATH bash is not working in screen when it's working in xterm and the in_screen script already wrap all the command within a bash shell so there is no need to re-force bash as the echo will execute in a bash shell Signed-off-by: Matthieu Patou <mat@matws.net> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Tue Jan 22 13:03:52 CET 2013 on sn-devel-104
-rwxr-xr-xselftest/selftest.pl15
1 files changed, 8 insertions, 7 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 4ac5aeb2a4..639c8a2fd7 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -849,13 +849,7 @@ if ($opt_testenv) {
my $envvarstr = exported_envvars_str($testenv_vars);
- my @term = ();
- if ($ENV{TERMINAL}) {
- @term = ($ENV{TERMINAL});
- } else {
- @term = ("xterm", "-e");
- }
- my @term_args = ("bash", "-c", "echo -e \"
+ my @term_args = ("echo -e \"
Welcome to the Samba4 Test environment '$testenv_name'
This matches the client environment used in make test
@@ -867,6 +861,13 @@ SMB_CONF_PATH=\$SMB_CONF_PATH
$envvarstr
\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash");
+ my @term = ();
+ if ($ENV{TERMINAL}) {
+ @term = ($ENV{TERMINAL});
+ } else {
+ @term = ("xterm", "-e");
+ unshift(@term_args, ("bash", "-c"));
+ }
system(@term, @term_args);