From fe19a3556c3de471834ffc025cfe3e7bc145178e Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 24 Sep 2012 16:06:45 +0200
Subject: [PATCH] Fix shelltests for ganeti-*
They were never run.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
test/cli-test.bash | 2 +-
test/ganeti-cli.test | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/cli-test.bash b/test/cli-test.bash
index 9c1f1fab0..f768a5abd 100755
--- a/test/cli-test.bash
+++ b/test/cli-test.bash
@@ -4,5 +4,5 @@ export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
export DAEMONS=${TOP_BUILDDIR:-.}/daemons
shelltest $SHELLTESTARGS \
- ${TOP_SRCDIR:-.}/test/gnt-*.test \
+ ${TOP_SRCDIR:-.}/test/{gnt,ganeti}-*.test \
-- --hide-successes
diff --git a/test/ganeti-cli.test b/test/ganeti-cli.test
index 054a6189b..25c2c6f7a 100644
--- a/test/ganeti-cli.test
+++ b/test/ganeti-cli.test
@@ -1,36 +1,36 @@
# test the various gnt-commands for common options
-$SCRIPTS/ganeti-masterd --help
+$DAEMONS/ganeti-masterd --help
>>>/Usage:/
>>>2
>>>= 0
-$SCRIPTS/ganeti-masterd --version
+$DAEMONS/ganeti-masterd --version
>>>/^ganeti-/
>>>2
>>>= 0
-$SCRIPTS/ganeti-noded --help
+$DAEMONS/ganeti-noded --help
>>>/Usage:/
>>>2
>>>= 0
-$SCRIPTS/ganeti-noded --version
+$DAEMONS/ganeti-noded --version
>>>/^ganeti-/
>>>2
>>>= 0
-$SCRIPTS/ganeti-rapi --help
+$DAEMONS/ganeti-rapi --help
>>>/Usage:/
>>>2
>>>= 0
-$SCRIPTS/ganeti-rapi --version
+$DAEMONS/ganeti-rapi --version
>>>/^ganeti-/
>>>2
>>>= 0
-$SCRIPTS/ganeti-watcher --help
+$DAEMONS/ganeti-watcher --help
>>>/Usage:/
>>>2
>>>= 0
-$SCRIPTS/ganeti-watcher --version
+$DAEMONS/ganeti-watcher --version
>>>/^ganeti-/
>>>2
>>>= 0
--
GitLab