Fix shelltests for ganeti-*

They were never run.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/test/cli-test.bash b/test/cli-test.bash
index 9c1f1fa..f768a5a 100755 (executable)
--- 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 054a618..25c2c6f 100644 (file)
--- 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