From dd1f23dc682c2e45950905cc4c13d032aef83698 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 8 Jul 2014 11:40:52 +1000 Subject: ctdb-build: Check the return value of RUN_COMMAND RUN_COMMAND does not raise exceptions if the command fails, but returns non-zero status. Ensure that make terminates with non-zero status if RUN_COMMAND fails. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/wscript | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ctdb/wscript b/ctdb/wscript index df7ce98a77..db5e5b6f43 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -528,7 +528,10 @@ def build(bld): def testonly(ctx): cmd = 'tests/run_tests.sh -V tests/var' - samba_utils.RUN_COMMAND(cmd) + ret = samba_utils.RUN_COMMAND(cmd) + if ret != 0: + print('tests exited with exit status %d' % ret) + sys.exit(ret) def test(ctx): import Scripting @@ -537,7 +540,10 @@ def test(ctx): def autotest(ctx): cmd = 'LD_PRELOAD=bin/shared/libsocket-wrapper.so tests/run_tests.sh -e -S -C' - samba_utils.RUN_COMMAND(cmd) + ret = samba_utils.RUN_COMMAND(cmd) + if ret != 0: + print('autotest exited with exit status %d' % ret) + sys.exit(ret) def show_version(ctx): print VERSION @@ -576,7 +582,10 @@ def dist(): def rpmonly(ctx): cmd = 'rpmbuild -ta --clean --rmsource ctdb-%s.tar.gz' % VERSION - samba_utils.RUN_COMMAND(cmd) + ret = samba_utils.RUN_COMMAND(cmd) + if ret != 0: + print('rpmbuild exited with exit status %d' % ret) + sys.exit(ret) def rpm(ctx): import Scripting -- cgit