unit tests: Add tests for uid and gid handling in utils.WriteFile

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 80e4808..bccae3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,15 +137,12 @@ CLEANFILES = \
        $(PYTHON_BOOTSTRAP) \
        epydoc.conf \
        autotools/replace_vars.sed \
+       autotools/testrunner \
        daemons/daemon-util \
        daemons/ganeti-cleaner \
        devel/upload \
+       $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
-       doc/examples/ganeti.initd \
-       doc/examples/ganeti-kvm-poweroff.initd \
-       doc/examples/ganeti.cron \
-       doc/examples/gnt-config-backup \
-       doc/examples/hooks/ipsec \
        lib/_generated_rpc.py \
        $(man_MANS) \
        $(manhtml) \
@@ -170,6 +167,14 @@ BUILT_PYTHON_SOURCES = \
        lib/_vcsversion.py \
        lib/_generated_rpc.py
 
+# these are all built from the underlying %.in sources
+BUILT_EXAMPLES = \
+       doc/examples/ganeti-kvm-poweroff.initd \
+       doc/examples/ganeti.cron \
+       doc/examples/ganeti.initd \
+       doc/examples/gnt-config-backup \
+       doc/examples/hooks/ipsec
+
 nodist_pkgpython_PYTHON = \
        $(BUILT_PYTHON_SOURCES)
 
@@ -426,14 +431,11 @@ docpng = $(patsubst %.dot,%.png,$(docdot))
 # Things to build but not to install (add it to EXTRA_DIST if it should be
 # distributed)
 noinst_DATA = \
+       autotools/testrunner \
        devel/upload \
        doc/html \
+       $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
-       doc/examples/ganeti.cron \
-       doc/examples/ganeti.initd \
-       doc/examples/ganeti-kvm-poweroff.initd \
-       doc/examples/gnt-config-backup \
-       doc/examples/hooks/ipsec \
        $(manhtml)
 
 gnt_scripts = \
@@ -452,14 +454,7 @@ PYTHON_BOOTSTRAP_SBIN = \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
        daemons/ganeti-rapi \
-       scripts/gnt-backup \
-       scripts/gnt-cluster \
-       scripts/gnt-debug \
-       scripts/gnt-group \
-       scripts/gnt-instance \
-       scripts/gnt-job \
-       scripts/gnt-node \
-       scripts/gnt-os
+       $(gnt_scripts)
 
 PYTHON_BOOTSTRAP = \
        $(PYTHON_BOOTSTRAP_SBIN) \
@@ -522,7 +517,7 @@ nodist_sbin_SCRIPTS = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        daemons/ganeti-cleaner
 
-dist_tools_PYTHON = \
+python_scripts = \
        tools/burnin \
        tools/cfgshell \
        tools/cfgupgrade \
@@ -536,7 +531,7 @@ dist_tools_PYTHON = \
        tools/sanitize-config
 
 dist_tools_SCRIPTS = \
-       $(dist_tools_PYTHON) \
+       $(python_scripts) \
        tools/kvm-console-wrapper \
        tools/xm-console-wrapper \
        tools/master-ip-setup
@@ -573,7 +568,7 @@ EXTRA_DIST = \
        autotools/convert-constants \
        autotools/docpp \
        autotools/gen-coverage \
-       autotools/testrunner \
+       autotools/testrunner.in \
        $(RUN_IN_TEMPDIR) \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
@@ -585,14 +580,10 @@ EXTRA_DIST = \
        $(docrst) \
        doc/conf.py \
        doc/html \
-       doc/examples/ganeti.initd.in \
-       doc/examples/ganeti-kvm-poweroff.initd.in \
-       doc/examples/ganeti.cron.in \
-       doc/examples/gnt-config-backup.in \
+       $(BUILT_EXAMPLES:%=%.in) \
        doc/examples/ganeti.default \
        doc/examples/ganeti.default-debug \
        doc/examples/hooks/ethers \
-       doc/examples/hooks/ipsec.in \
        doc/examples/gnt-debug/README \
        doc/examples/gnt-debug/delay0.json \
        doc/examples/gnt-debug/delay50.json \
@@ -606,7 +597,8 @@ EXTRA_DIST = \
        qa/qa-sample.json \
        $(qa_scripts) \
        $(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
-       $(HS_PROG_SRCS)
+       $(HS_PROG_SRCS) \
+       htools/lint-hints.hs
 
 man_MANS = \
        man/ganeti.7 \
@@ -750,6 +742,9 @@ python_tests = \
        test/docs_unittest.py \
        test/pycurl_reset_unittest.py \
        test/tempfile_fork_unittest.py
+if HAS_FAKEROOT
+python_tests += test/ganeti.utils.io_unittest-runasroot.py
+endif
 
 haskell_tests = htools/test
 
@@ -777,7 +772,7 @@ TESTS_ENVIRONMENT = \
 
 all_python_code = \
        $(dist_sbin_SCRIPTS) \
-       $(dist_tools_PYTHON) \
+       $(python_scripts) \
        $(pkglib_python_scripts) \
        $(nodist_pkglib_python_scripts) \
        $(python_tests) \
@@ -816,7 +811,7 @@ lint_python_code = \
        ganeti \
        ganeti/http/server.py \
        $(dist_sbin_SCRIPTS) \
-       $(dist_tools_PYTHON) \
+       $(python_scripts) \
        $(pkglib_python_scripts) \
        $(BUILD_BASH_COMPLETION) \
        $(CHECK_IMPORTS) \
@@ -832,7 +827,7 @@ pep8_python_code = \
        ganeti \
        ganeti/http/server.py \
        $(dist_sbin_SCRIPTS) \
-       $(dist_tools_PYTHON) \
+       $(python_scripts) \
        $(pkglib_python_scripts) \
        $(BUILD_BASH_COMPLETION) \
        $(CHECK_HEADER) \
@@ -848,6 +843,10 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
+autotools/testrunner: autotools/testrunner.in $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
+       chmod u+x $@
+
 devel/upload: devel/upload.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod u+x $@
@@ -1058,6 +1057,7 @@ $(REPLACE_VARS_SED): Makefile
          echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
          echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
          echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
+         echo 's#@FAKEROOT@#$(FAKEROOT_PATH)#g'; \
        } > $@
 
 # Using deferred evaluation
@@ -1179,9 +1179,16 @@ lint: $(BUILT_SOURCES)
          --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 
 .PHONY: hlint
-hlint: $(HS_BUILT_SRCS)
+hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
        if tty -s; then C="-c"; else C=""; fi; \
-       hlint --report=doc/hs-lint.html $$C htools
+       hlint --report=doc/hs-lint.html --cross $$C \
+         --ignore "Use first" \
+         --ignore "Use comparing" \
+         --ignore "Use on" \
+         --ignore "Use Control.Exception.catch" \
+         --ignore "Reduce duplication" \
+         --hint htools/lint-hints \
+         $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...