Expose bulk parameter for GetJobs in RAPI client
[ganeti-local] / Makefile.am
index a03cd3d..a99c84a 100644 (file)
@@ -103,6 +103,7 @@ DIRS = \
        test/data/htools \
        test/data/htools/rapi \
        test/hs/shelltests \
+       test/autotools \
        lib \
        lib/build \
        lib/client \
@@ -831,7 +832,7 @@ test/hs/hpc-htools: HEXTRA_INT=-fhpc
 test/hs/hpc-mon-collector: HEXTRA_INT=-fhpc
 
 # test dependency
-test/hs/offline-tests.sh: test/hs/hpc-htools test/hs/hpc-mon-collector
+test/hs/offline-test.sh: test/hs/hpc-htools test/hs/hpc-mon-collector
 
 # rules for building profiling-enabled versions of the haskell
 # programs: hs-prof does the full two-step build, whereas
@@ -1020,6 +1021,7 @@ maninput = \
        $(mangen)
 
 TEST_FILES = \
+       test/autotools/autotools-check-news.test \
        test/data/htools/clean-nonzero-score.data \
        test/data/htools/common-suffix.data \
        test/data/htools/empty-cluster.data \
@@ -1036,6 +1038,7 @@ TEST_FILES = \
        test/data/htools/hbal-split-insts.data \
        test/data/htools/hspace-tiered-dualspec.data \
        test/data/htools/hspace-tiered-ipolicy.data \
+       test/data/htools/hspace-tiered-resourcetypes.data \
        test/data/htools/hspace-tiered.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \
@@ -1095,6 +1098,8 @@ TEST_FILES = \
        test/data/kvm_0.9.1_help_boot_test.txt \
        test/data/kvm_1.0_help.txt \
        test/data/kvm_1.1.2_help.txt \
+       test/data/NEWS_OK.txt \
+       test/data/NEWS_previous_unreleased.txt \
        test/data/ovfdata/compr_disk.vmdk.gz \
        test/data/ovfdata/config.ini \
        test/data/ovfdata/corrupted_resources.ovf \
@@ -1142,6 +1147,7 @@ TEST_FILES = \
        test/py/gnt-cli.test \
        test/py/import-export_unittest-helper
 
+
 python_tests = \
        doc/examples/rapi_testutils.py \
        test/py/cfgupgrade_unittest.py \
@@ -1231,8 +1237,11 @@ dist_TESTS = \
        test/py/ganeti-cleaner_unittest.bash \
        test/py/import-export_unittest.bash \
        test/py/cli-test.bash \
-       test/py/bash_completion.bash \
-       $(python_tests)
+       test/py/bash_completion.bash
+
+if !PY_NODEV
+       dist_TESTS += $(python_tests)
+endif
 
 nodist_TESTS =
 check_SCRIPTS =
@@ -1265,7 +1274,6 @@ all_python_code = \
        $(pkglib_python_scripts) \
        $(nodist_pkglib_python_scripts) \
        $(nodist_tools_python_scripts) \
-       $(python_tests) \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
        $(cmdlib_PYTHON) \
@@ -1282,6 +1290,10 @@ all_python_code = \
        $(noinst_PYTHON) \
        $(qa_scripts)
 
+if !PY_NODEV
+       all_python_code += $(python_tests)
+endif
+
 srclink_files = \
        man/footer.rst \
        test/py/check-cert-expired_unittest.bash \
@@ -1715,28 +1727,30 @@ check-local: check-dirs $(GENERATED_FILES)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
        RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
-       @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        error= ; \
-       if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
-         echo "Incorrect version in README, expected $$expver" >&2; \
-         error=1; \
-       fi; \
-       for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
-           doc/security.rst; do \
-         if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
-           "Documents Ganeti version $$expver"; then \
-           echo "Incorrect version in $$file, expected $$expver" >&2; \
+       if [ "x`echo $(VERSION_SUFFIX)|grep 'alpha'`" == "x" ]; then \
+         expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+         if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
+           echo "Incorrect version in README, expected $$expver" >&2; \
+           error=1; \
+         fi; \
+         for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
+             doc/security.rst; do \
+           if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
+             "Documents Ganeti version $$expver"; then \
+             echo "Incorrect version in $$file, expected $$expver" >&2; \
+             error=1; \
+           fi; \
+         done; \
+         if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
+           echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \
+           error=1; \
+         fi; \
+         if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \
+           ".. Last updated for Ganeti $$expver"; then \
+           echo "doc/design-draft.rst was not updated for version $$expver" >&2; \
            error=1; \
          fi; \
-       done; \
-       if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
-         echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \
-         error=1; \
-       fi; \
-       if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \
-         ".. Last updated for Ganeti $$expver"; then \
-         echo "doc/design-draft.rst was not updated for version $$expver" >&2; \
-         error=1; \
        fi; \
        for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \
          if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \
@@ -1950,12 +1964,17 @@ TAGS: $(GENERATED_FILES)
          etags -l python -a -
 
 .PHONY: coverage
+
+COVERAGE_TESTS=
 if WANT_HTOOLS
-coverage: py-coverage hs-coverage
-else
-coverage: py-coverage
+COVERAGE_TESTS += hs-coverage
+endif
+if !PY_NODEV
+COVERAGE_TESTS += py-coverage
 endif
 
+coverage: $(COVERAGE_TESTS)
+
 .PHONY: py-coverage
 py-coverage: $(GENERATED_FILES) $(python_tests)
        @test -n "$(PYCOVERAGE)" || \
@@ -1996,7 +2015,12 @@ live-test: all
          --srcdir=.. $(HPCEXCL) ; \
        hpc report --srcdir=.. live-test $(HPCEXCL)
 
-commit-check: distcheck lint apidoc
+commit-check: autotools-check distcheck lint apidoc
+
+autotools-check:
+       TESTDATA_DIR=./test/data shelltest $(SHELLTESTARGS) \
+  $(abs_top_srcdir)/test/autotools/*-*.test \
+  -- --hide-successes
 
 .PHONY: gitignore-check
 gitignore-check: