diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-04-24 17:33:04 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-04-24 17:33:04 +0000 |
| commit | 96de2891830e8418cdd0cebe83faf047cc74dbba (patch) | |
| tree | d231be7269c7ba552cc0a2fa1fd940efe7521c0b /src/config | |
| parent | d67798fd6618ecee493f6cb1b150e4ebdf35e3f1 (diff) | |
| download | krb5-96de2891830e8418cdd0cebe83faf047cc74dbba.tar.gz krb5-96de2891830e8418cdd0cebe83faf047cc74dbba.tar.xz krb5-96de2891830e8418cdd0cebe83faf047cc74dbba.zip | |
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/config')
| -rw-r--r-- | src/config/post.in | 28 | ||||
| -rw-r--r-- | src/config/pre.in | 6 |
2 files changed, 10 insertions, 24 deletions
diff --git a/src/config/post.in b/src/config/post.in index d25484910..43c218bdf 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -129,28 +129,12 @@ undepend-postrecurse: undepend-recurse ############################## # Python tests -check-unix:: check-pytests - -# Makefile.in should add dependencies to check-pytests for test -# programs that need to be built before scripts are run. - -check-pytests:: check-pytests-@HAVE_PYTHON@ - -check-pytests-yes: - @pytests="$(PYTESTS)"; \ - for t in $$pytests; do \ - echo PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util \ - VALGRIND="$(VALGRIND)" \ - $(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS); \ - PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util \ - VALGRIND="$(VALGRIND)" \ - $(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS) || exit 1; \ - done - -check-pytests-no: - @if test -n "$(PYTESTS)"; then \ - echo "+++ Skipping because Python not available: $(PYTESTS)"; \ - fi +check-unix:: check-pytests-@HAVE_PYTHON@ + +# Makefile.in should add rules to check-pytests to execute Python tests. +check-pytests-yes:: check-pytests +check-pytests-no:: +check-pytests:: clean:: clean-$(WHAT) diff --git a/src/config/pre.in b/src/config/pre.in index a39c0faa5..a4f56896e 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -244,6 +244,9 @@ host=@krb5_cv_host@ DEJAFLAGS = --debug --srcdir $(srcdir) --host $(host) RUNTEST = runtest $(DEJAFLAGS) +RUNPYTEST = PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util \ + VALGRIND="$(VALGRIND)" $(PYTHON) + START_SERVERS = $(STESTDIR)/scripts/start_servers $(TEST_SERVER) $(TEST_PATH) START_SERVERS_LOCAL = $(STESTDIR)/scripts/start_servers_local @@ -572,8 +575,7 @@ VALGRIND1 = valgrind --tool=memcheck --log-file=$(VALGRIND_LOGDIR)/vg --trace-ch # something that looks like an FQDN, with an IPv4 address. OFFLINE=no -# Makefile.in should set PYTESTS to a list of Python test scripts to run. -PYTESTS= +# Used when running Python tests. PYTESTFLAGS= ## |