svn rev #25289: trunk/src/tests/

tlyu@MIT.EDU tlyu at MIT.EDU
Thu Sep 29 18:05:42 EDT 2011


http://src.mit.edu/fisheye/changelog/krb5/?cs=25289
Commit By: tlyu
Log Message:
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.


Changed Files:
U   trunk/src/tests/Makefile.in
Modified: trunk/src/tests/Makefile.in
===================================================================
--- trunk/src/tests/Makefile.in	2011-09-29 21:35:18 UTC (rev 25288)
+++ trunk/src/tests/Makefile.in	2011-09-29 22:05:42 UTC (rev 25289)
@@ -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,14 +18,8 @@
 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
+check-unix:: kdb_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
-
 kdc.conf: Makefile
 	rm -rf kdc.conf
 	@echo "[realms]" > kdc.conf
@@ -76,10 +70,8 @@
 	$(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
-
-




More information about the cvs-krb5 mailing list