[gssproxy] 01/02: Fix make distcheck

This is an automated email from the git hooks/post-receive script. rharwood pushed a commit to branch master in repository gssproxy. commit b84ca49895d5325ec5ca44cd73139b4c9a4374c4 Author: Simo Sorce <simo(a)redhat.com&gt; Date: Wed Jan 18 17:10:28 2017 -0500 Fix make distcheck We need to override absolute patchs for make distcheck, as this target does a dryrun install in a speciual prefix path, so special override system unit dirs only during distcheck Also it's illegal to specify wildcards as a target in Makefiles ... Fixed runtest.py as well to look for tests in the right place Signed-off-by: Simo Sorce <simo(a)redhat.com&gt; Reviewed-by: Robbie Harwood <rharwood(a)redhat.com&gt; Merges #44 --- proxy/Makefile.am | 8 +++++++- proxy/tests/Makefile.am | 11 ++++++++++- proxy/tests/runtests.py | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index a3c7211..644694f 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -30,6 +30,10 @@ pkgconfigdir = $(libdir)/pkgconfig gpstatedir = @gpstatedir@ gpclidir = @gpstatedir@/clients + +AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdunitdir='$$(prefix)/$(systemdunitdir)' + AM_CPPFLAGS = AM_CFLAGS = AM_LDFLAGS = @@ -308,13 +312,15 @@ endif clean-local: rm -Rf doc + rm -Rf testdir CLEANFILES = *.X */*.X */*/*.X \ examples/mech \ examples/gssproxy.conf \ examples/24-nfs-server.conf \ examples/80-httpd.conf \ - examples/99-nfs-client.conf + examples/99-nfs-client.conf \ + systemd/gssproxy.service check: all $(check_PROGRAMS) $(srcdir)/tests/runtests.py diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am index 6f5206b..6abc8c1 100644 --- a/proxy/tests/Makefile.am +++ b/proxy/tests/Makefile.am @@ -46,6 +46,15 @@ noinst_PROGRAMS = $(check_PROGRAMS) noinst_HEADERS = \ t_utils.h -EXTRA_DIST = *.py +EXTRA_DIST = \ + runtests.py \ + t_acquire.py \ + t_basic.py \ + t_cred_store.py \ + testlib.py \ + t_impersonate.py \ + t_interpose.py \ + t_multi_key.py \ + t_reloading.py all: $(check_PROGRAMS) diff --git a/proxy/tests/runtests.py b/proxy/tests/runtests.py index 9b3625c..dd8eb84 100755 --- a/proxy/tests/runtests.py +++ b/proxy/tests/runtests.py @@ -59,7 +59,7 @@ if __name__ == '__main__': basicconf["keysenv"] = keysenv testnum = 0 - testfiles = [f for f in os.listdir("tests") \ + testfiles = [f for f in os.listdir(os.path.dirname(sys.argv[0])) \ if f.endswith(".py") and f.startswith("t_")] testfiles.sort() print("Tests to be run: " + ", ".join(testfiles)) -- To stop receiving notification emails like this one, please contact the administrator of this repository.