svn rev #23520: trunk/src/ config/ lib/krb5/os/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23520
Commit By: raeburn
Log Message:
ticket: 6606
subject: allow testing when offline

Define new make variable OFFLINE to "no"; if it's set to "yes", skip
the testing of t_locate_kdc, which requires access to mit.edu SRV
records.


Changed Files:
U   trunk/src/config/pre.in
U   trunk/src/lib/krb5/os/Makefile.in
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in	2009-12-28 00:21:00 UTC (rev 23519)
+++ trunk/src/config/pre.in	2009-12-28 00:21:06 UTC (rev 23520)
@@ -564,6 +564,13 @@
 VALGRIND_LOGDIR = `cd $(BUILDTOP)&&pwd`
 VALGRIND1 = valgrind --tool=memcheck --log-file=$(VALGRIND_LOGDIR)/vg --trace-children=yes -v --leak-check=yes --suppressions=`cd $(top_srcdir)&&pwd`/util/valgrind-suppressions
 
+# Set OFFLINE=yes to disable tests that assume network connectivity.
+# (Specifically, this concerns the ability to fetch DNS data for
+# mit.edu, to verify that SRV queries are working.)  Note that other
+# tests still assume that the local hostname can be resolved into
+# something that looks like an FQDN, with an IPv4 address.
+OFFLINE=no
+
 ##
 ## end of pre.in
 ############################################################

Modified: trunk/src/lib/krb5/os/Makefile.in
===================================================================
--- trunk/src/lib/krb5/os/Makefile.in	2009-12-28 00:21:00 UTC (rev 23519)
+++ trunk/src/lib/krb5/os/Makefile.in	2009-12-28 00:21:06 UTC (rev 23520)
@@ -201,7 +201,11 @@
 	cmp test.out $(srcdir)/ref_std_conf.out
 	$(RM) test.out
 	KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
-	$(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc ATHENA.MIT.EDU
+	if test "$(OFFLINE)" != yes; then \
+	  $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc ATHENA.MIT.EDU; \
+	else \
+	  echo SKIPPING t_locate_kdc TEST WHILE OFFLINE; \
+	fi
 
 #
 # Do some aname-to-lname testing.