fence-agents: master - [build] Fix build system to cover tests properly

Marek GrĂ¡c marx at fedoraproject.org
Tue Jul 1 11:28:15 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=f0bb209a3a35c46cdb3cc2cbb2bdbdf4051407dc
Commit:        f0bb209a3a35c46cdb3cc2cbb2bdbdf4051407dc
Parent:        bc817baa3d02c6c20eb558b30669ff059a283aa5
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Tue Jul 1 13:18:05 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Tue Jul 1 13:18:05 2014 +0200

[build] Fix build system to cover tests properly

---
 Makefile.am          |    2 +-
 make/agentccheck.mk  |    2 +-
 make/agentpycheck.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1bd077a..e70dac5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST		= autogen.sh make/fencebuild.mk scripts/fenceparse \
 			  .version make/release.mk \
-			  make/git-version-gen make/gitlog-to-changelog
+			  make/git-version-gen make/gitlog-to-changelog tests
 
 AUTOMAKE_OPTIONS	= foreign
 
diff --git a/make/agentccheck.mk b/make/agentccheck.mk
index 32dc160..3ef97f9 100644
--- a/make/agentccheck.mk
+++ b/make/agentccheck.mk
@@ -1,5 +1,5 @@
 TEMPFILE:=$(shell mktemp)
-DATADIR:=../../../tests/data/metadata
+DATADIR:=$(abs_top_builddir)/../tests/data/metadata
 
 check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%)
 
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index 271e0bf..ae4e477 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,5 +1,5 @@
 TEMPFILE:=$(shell mktemp)
-DATADIR:=../../../tests/data/metadata
+DATADIR:=$(abs_top_builddir)/../tests/data/metadata
 
 check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
 


More information about the cluster-commits mailing list