Revision 30f2802f

b/Makefile.am
768 768
	test/data/vgs-missing-pvs-2.02.02.txt \
769 769
	test/data/vgs-missing-pvs-2.02.66.txt \
770 770
	test/import-export_unittest-helper \
771
	test/gnt-cli.test \
772
	test/ganeti-cli.test \
771 773
	test/htools-balancing.test \
772 774
	test/htools-basic.test \
773 775
	test/htools-dynutil.test \
......
857 859
	test/daemon-util_unittest.bash \
858 860
	test/ganeti-cleaner_unittest.bash \
859 861
	test/import-export_unittest.bash \
862
	test/cli-test.bash \
860 863
	$(python_tests)
861 864

  
862 865
nodist_TESTS =
......
872 875

  
873 876
# Environment for all tests
874 877
PLAIN_TESTS_ENVIRONMENT = \
875
	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) \
876
	FAKEROOT=$(FAKEROOT_PATH) $(RUN_IN_TEMPDIR)
878
	PYTHONPATH=. \
879
	TOP_SRCDIR=$(abs_top_srcdir) TOP_BUILDDIR=$(abs_top_builddir) \
880
	PYTHON=$(PYTHON) FAKEROOT=$(FAKEROOT_PATH) \
881
	$(RUN_IN_TEMPDIR)
877 882

  
878 883
# Environment for tests run by automake
879 884
TESTS_ENVIRONMENT = \
......
906 911
	test/daemon-util_unittest.bash \
907 912
	test/ganeti-cleaner_unittest.bash \
908 913
	test/import-export_unittest.bash \
914
	test/cli-test.bash \
909 915
	htools/offline-test.sh \
910 916
	htools/cli-tests-defs.sh \
911 917
	$(all_python_code) \
b/htools/offline-test.sh
86 86

  
87 87
echo Running shelltest...
88 88

  
89
shelltest $SHELLTESTARGS ${TOP_SRCDIR:-.}/test/ -- --hide-successes
89
shelltest $SHELLTESTARGS \
90
  ${TOP_SRCDIR:-.}/test/htools-*.test \
91
  -- --hide-successes
90 92

  
91 93
echo All OK
b/test/cli-test.bash
1
#!/bin/bash
2

  
3
export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
4
export DAEMONS=${TOP_BUILDDIR:-.}/daemons
5

  
6
shelltest $SHELLTESTARGS \
7
  ${TOP_SRCDIR:-.}/test/gnt-*.test \
8
  -- --hide-successes
b/test/ganeti-cli.test
1
# test the various gnt-commands for common options
2
$SCRIPTS/ganeti-masterd --help
3
>>>/Usage:/
4
>>>2
5
>>>= 0
6
$SCRIPTS/ganeti-masterd --version
7
>>>/^ganeti-/
8
>>>2
9
>>>= 0
10

  
11
$SCRIPTS/ganeti-noded --help
12
>>>/Usage:/
13
>>>2
14
>>>= 0
15
$SCRIPTS/ganeti-noded --version
16
>>>/^ganeti-/
17
>>>2
18
>>>= 0
19

  
20
$SCRIPTS/ganeti-rapi --help
21
>>>/Usage:/
22
>>>2
23
>>>= 0
24
$SCRIPTS/ganeti-rapi --version
25
>>>/^ganeti-/
26
>>>2
27
>>>= 0
28

  
29
$SCRIPTS/ganeti-watcher --help
30
>>>/Usage:/
31
>>>2
32
>>>= 0
33
$SCRIPTS/ganeti-watcher --version
34
>>>/^ganeti-/
35
>>>2
36
>>>= 0
b/test/gnt-cli.test
1
# test the various gnt-commands for common options
2
$SCRIPTS/gnt-node --help
3
>>>/Usage:/
4
>>>2
5
>>>= 1
6
$SCRIPTS/gnt-node --version
7
>>>/^gnt-/
8
>>>2
9
>>>= 0
10

  
11
$SCRIPTS/gnt-instance --help
12
>>>/Usage:/
13
>>>2
14
>>>= 1
15
$SCRIPTS/gnt-instance --version
16
>>>/^gnt-instance/
17
>>>2
18
>>>= 0
19

  
20
$SCRIPTS/gnt-os --help
21
>>>/Usage:/
22
>>>2
23
>>>= 1
24
$SCRIPTS/gnt-os --version
25
>>>/^gnt-/
26
>>>2
27
>>>= 0
28

  
29
$SCRIPTS/gnt-group --help
30
>>>/Usage:/
31
>>>2
32
>>>= 1
33
$SCRIPTS/gnt-group --version
34
>>>/^gnt-/
35
>>>2
36
>>>= 0
37

  
38
$SCRIPTS/gnt-job --help
39
>>>/Usage:/
40
>>>2
41
>>>= 1
42
$SCRIPTS/gnt-job --version
43
>>>/^gnt-/
44
>>>2
45
>>>= 0
46

  
47
$SCRIPTS/gnt-cluster --help
48
>>>/Usage:/
49
>>>2
50
>>>= 1
51
$SCRIPTS/gnt-cluster --version
52
>>>/^gnt-/
53
>>>2
54
>>>= 0
55

  
56
$SCRIPTS/gnt-backup --help
57
>>>/Usage:/
58
>>>2
59
>>>= 1
60
$SCRIPTS/gnt-backup --version
61
>>>/^gnt-/
62
>>>2
63
>>>= 0
64

  
65
$SCRIPTS/gnt-debug --help
66
>>>/Usage:/
67
>>>2
68
>>>= 1
69
$SCRIPTS/gnt-debug --version
70
>>>/^gnt-/
71
>>>2
72
>>>= 0

Also available in: Unified diff