summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-09-29 22:05:42 +0000
committerTom Yu <tlyu@mit.edu>2011-09-29 22:05:42 +0000
commit855dceba08a5e241bda26fde655a37e171675564 (patch)
tree20649d15c913fd4f275c1f52fc01a67b2e07eb2b /src
parent7af963fad68f8cedba7c0f627b7187a24e4ae706 (diff)
downloadkrb5-855dceba08a5e241bda26fde655a37e171675564.tar.gz
krb5-855dceba08a5e241bda26fde655a37e171675564.tar.xz
krb5-855dceba08a5e241bda26fde655a37e171675564.zip
Revert r25288 because it can remove parts of the source tree
Also, disable kdc_realm test until it works correctly on an uninstalled build and when built outside of the source tree. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25289 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/tests/Makefile.in14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index e30872f2fa..4709cea25d 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,7 +1,7 @@
mydir=tests
BUILDTOP=$(REL)..
SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
- gss-threads misc mkeystash_compat kdc_realm
+ gss-threads misc mkeystash_compat
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
KRB5_RUN_ENV= @KRB5_RUN_ENV@
@@ -18,13 +18,7 @@ TEST_PREFIX = "foo bar"
KADMIN_OPTS= -d $(TEST_DB) -r $(TEST_REALM) -P $(TEST_MKEY)
KTEST_OPTS= $(KADMIN_OPTS) -p $(TEST_PREFIX) -n $(TEST_NUM) -D $(TEST_DEPTH)
-check-unix:: kdb_check kdc_realm_check
-
-kdc_realm_check:
- cp -R $(top_srcdir)/tests/kdc_realm kdc_realm_tmp
- rm -rf kdc_realm
- cp -R kdc_realm_tmp kdc_realm
- rm -rf kdc_realm_tmp
+check-unix:: kdb_check
kdc.conf: Makefile
rm -rf kdc.conf
@@ -76,10 +70,8 @@ check-pytests::
$(RUNPYTEST) $(srcdir)/t_renprinc.py $(PYTESTFLAGS)
$(RUNPYTEST) $(srcdir)/t_cccol.py $(PYTESTFLAGS)
$(RUNPYTEST) $(srcdir)/t_stringattr.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/kdc_realm/kdcref.py $(PYTESTFLAGS)
+# $(RUNPYTEST) $(srcdir)/kdc_realm/kdcref.py $(PYTESTFLAGS)
clean::
$(RM) kdc.conf
$(RM) -rf kdc_realm/sandbox
-
-