Skip to content

Commit b84ca49

Browse files
simo5frozencemetery
authored andcommitted
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 <[email protected]> Reviewed-by: Robbie Harwood <[email protected]> Merges #44
1 parent 344cb6f commit b84ca49

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

proxy/Makefile.am

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ pkgconfigdir = $(libdir)/pkgconfig
3030
gpstatedir = @gpstatedir@
3131
gpclidir = @gpstatedir@/clients
3232

33+
34+
AM_DISTCHECK_CONFIGURE_FLAGS = \
35+
--with-systemdunitdir='$$(prefix)/$(systemdunitdir)'
36+
3337
AM_CPPFLAGS =
3438
AM_CFLAGS =
3539
AM_LDFLAGS =
@@ -308,13 +312,15 @@ endif
308312

309313
clean-local:
310314
rm -Rf doc
315+
rm -Rf testdir
311316

312317
CLEANFILES = *.X */*.X */*/*.X \
313318
examples/mech \
314319
examples/gssproxy.conf \
315320
examples/24-nfs-server.conf \
316321
examples/80-httpd.conf \
317-
examples/99-nfs-client.conf
322+
examples/99-nfs-client.conf \
323+
systemd/gssproxy.service
318324

319325
check: all $(check_PROGRAMS)
320326
$(srcdir)/tests/runtests.py

proxy/tests/Makefile.am

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ noinst_PROGRAMS = $(check_PROGRAMS)
4646
noinst_HEADERS = \
4747
t_utils.h
4848

49-
EXTRA_DIST = *.py
49+
EXTRA_DIST = \
50+
runtests.py \
51+
t_acquire.py \
52+
t_basic.py \
53+
t_cred_store.py \
54+
testlib.py \
55+
t_impersonate.py \
56+
t_interpose.py \
57+
t_multi_key.py \
58+
t_reloading.py
5059

5160
all: $(check_PROGRAMS)

proxy/tests/runtests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def parse_args():
5959
basicconf["keysenv"] = keysenv
6060

6161
testnum = 0
62-
testfiles = [f for f in os.listdir("tests") \
62+
testfiles = [f for f in os.listdir(os.path.dirname(sys.argv[0])) \
6363
if f.endswith(".py") and f.startswith("t_")]
6464
testfiles.sort()
6565
print("Tests to be run: " + ", ".join(testfiles))

0 commit comments

Comments
 (0)