From 2492bbc3bb8a115be0b0a6fe85fd42f906df8395 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 8 Mar 2016 13:31:28 +0100 Subject: cli: Don't override cli mode when stdin in not a tty Cherry picked from commit f139fc7e44da27670e90bd7ba55ff80e7c8b8ecd: > Change-Id: I801c6e6ecd6c5a91e487e8e54ec5f684d450a080 > BUG: 1047378 > Signed-off-by: Kaushal M > Reviewed-on: http://review.gluster.org/6687 > Tested-by: Gluster Build System > Reviewed-by: Vijay Bellur Change-Id: I801c6e6ecd6c5a91e487e8e54ec5f684d450a080 BUG: 1313968 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/13648 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra Talur --- cli/src/input.c | 2 +- tests/bugs/bug-1047378.t | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/bugs/bug-1047378.t diff --git a/cli/src/input.c b/cli/src/input.c index a8ea46c6db6..26f337c3c27 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -87,7 +87,7 @@ cli_input_init (struct cli_state *state) cli_rl_enable (state); } else { state->prompt = ""; - state->mode = GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; + state->mode |= GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; } if (!state->rl_enabled) diff --git a/tests/bugs/bug-1047378.t b/tests/bugs/bug-1047378.t new file mode 100644 index 00000000000..b441ee9b149 --- /dev/null +++ b/tests/bugs/bug-1047378.t @@ -0,0 +1,12 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc + +cleanup; + +TEST glusterd +TEST pidof glusterd + +TEST "echo volume list | $CLI --xml | xmllint --format -" + +cleanup -- cgit