summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-04-24 17:33:04 +0000
committerGreg Hudson <ghudson@mit.edu>2010-04-24 17:33:04 +0000
commit96de2891830e8418cdd0cebe83faf047cc74dbba (patch)
treed231be7269c7ba552cc0a2fa1fd940efe7521c0b /src/tests
parentd67798fd6618ecee493f6cb1b150e4ebdf35e3f1 (diff)
Run Python tests as individual rule commands (friendlier to make -k)
instead of in a loop. Build runenv.py as part of make fake-install; it's harmless if Python is unavailable. Import runenv later in k5test so that we get a beter error message if make fake-install hasn't been run. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23932 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/Makefile.in5
-rw-r--r--src/tests/gssapi/Makefile.in3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 66a3db0768..df2c808cde 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -2,7 +2,6 @@ mydir=tests
BUILDTOP=$(REL)..
SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
gss-threads misc mkeystash_compat
-PYTESTS = t_general.py t_anonpkinit.py
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
KRB5_RUN_ENV= @KRB5_RUN_ENV@
@@ -61,6 +60,10 @@ kdb_check: kdc.conf krb5.conf
$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) destroy -f
$(RM) $(TEST_DB)* stash_file
+check-pytests::
+ $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS)
+ $(RUNPYTEST) $(srcdir)/t_anonpkinit.py $(PYTESTFLAGS)
+
clean::
$(RM) kdc.conf
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index ecd066e7cb..2ba81de61f 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -8,11 +8,10 @@ SRCS= $(srcdir)/t_imp_name.c $(srcdir)/t_s4u.c $(srcdir)/t_namingexts.c $(srcdir
OBJS= t_imp_name.o t_s4u.o t_namingexts.o t_gssexts.o t_spnego.o
-PYTESTS= t_gssapi.py
-
all:: t_imp_name t_s4u t_namingexts t_gssexts t_spnego
check-pytests:: t_spnego
+ $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS)
t_imp_name: t_imp_name.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o t_imp_name t_imp_name.o $(GSS_LIBS) $(KRB5_BASE_LIBS)