From fbe0ef56fb4d4f89a254546dd368caf44b5f65ec Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 5 Nov 2014 10:46:31 +0100 Subject: controller: add basic testsuite Copied from 'postgresql-setup' package. Also do some 'make dist' fixes. * controller/Makefile.am: Use $TEST_GEN_FILES_LIST. Also create the share/ directory during build. * controller/configure.ac: Initialize testsuite. * controller/tests/Makefile.am: Bureaucracy for testsuite. * controller/tests/atlocal.in: Likewise. * controller/tests/testsuite.at: Add two tests copied from postgresql-setup project. --- controller/Makefile.am | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'controller/Makefile.am') diff --git a/controller/Makefile.am b/controller/Makefile.am index a5d227d..0df88b8 100644 --- a/controller/Makefile.am +++ b/controller/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = . tests + bin_SCRIPTS = \ bin/dtf-run-remote \ bin/dtf-get-machine \ @@ -13,11 +15,12 @@ libexec_SCRIPTS = libexec/dtf-wait-for-ssh \ libexec/dtf-result-stats \ libexec/dtf-nova +noinst_DATA = $(TEST_GEN_FILES_LIST) ansiblevarsdir = $(pkgdatadir)/ansible/vars ansibleplaybooksdir = $(pkgdatadir)/ansible/playbooks -ansiblevars_DATA = $(srcdir)/share/dtf-controller/ansible/vars/generated-vars.yml +ansiblevars_DATA = share/dtf-controller/ansible/vars/generated-vars.yml dtfplaybookdir = $(pkgdatadir)/ansible/playbooks ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml @@ -30,7 +33,7 @@ share/dtf-controller/ansible/vars/generated-vars.yml: \ $(INSTANTIATE) .dep: $(c_s) - mkdir -p bin libexec etc + $(MKDIR_P) bin libexec etc share/dtf-controller/ansible/vars touch .dep libexec/dtf-commit-results: $(srcdir)/libexec/dtf-commit-results.in .dep @@ -83,8 +86,15 @@ CONTROLLERDATA = \ $(srcdir)/share/dtf-controller/ansible/dummy-wrapper.yml -EXTRA_DIST = $(srcdir)/libexec/dtf-wait-for-ssh \ - $(CONTROLLERSOURCES) \ - $(CONTROLLERDATA) +EXTRA_DIST = \ + $(CONTROLLERSOURCES) \ + $(CONTROLLERDATA) \ + $(srcdir)/libexec/dtf-wait-for-ssh + +CLEANFILES = $(GENERATED_FILES) .dep $(TEST_GEN_FILES_LIST) -CLEANFILES = $(GENERATED_FILES) .dep +$(TEST_GEN_FILES_LIST): $(GENERATED_FILES) + $(AM_V_GEN)rm -rf $(TEST_GEN_FILES_LIST) && \ + for i in $(GENERATED_FILES); do \ + echo $$i >> $@ ; \ + done -- cgit