From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 21 Dec 2014 13:22:31 +0000 (+0100)
Subject: tests: avoid bash == --shell confusion in docker-test-helper.sh
X-Git-Tag: v0.92~109^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0805957a20e54ab241cc1608d369fc48f183d36;p=ceph.git

tests: avoid bash == --shell confusion in docker-test-helper.sh

Do not force interactive mode when the bash script is specified by the
user because it should be usable to run a small script instead of
starting an interactive shell session.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
index d2ebc236539c..a9667c503dea 100755
--- a/src/test/docker-test-helper.sh
+++ b/src/test/docker-test-helper.sh
@@ -136,7 +136,7 @@ function run_in_docker() {
     cmd+=" --volume $downstream:$downstream"
     cmd+=" --volume $upstream:$upstream"
     local status=0
-    if test "$script" = "bash" ; then
+    if test "$script" = "SHELL" ; then
         $cmd --tty --interactive --workdir $downstream $user $dev $image bash
     else
         if ! $cmd --workdir $downstream $user $dev $image "$@" ; then
@@ -345,7 +345,7 @@ function main_docker() {
             if $remove ; then
                 remove_all $os_type $os_version || return 1
             elif $shell ; then
-                run_in_docker $os_type $os_version $dev $user "$opts" bash || return 1
+                run_in_docker $os_type $os_version $dev $user "$opts" SHELL || return 1
             else
                 run_in_docker $os_type $os_version $dev $user "$opts" "$@" || return 1
             fi