svn rev #23805: trunk/src/ config/ tests/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23805
Commit By: tlyu
Log Message:
Set up KRB5_RUN_ENV for pytests, so that Python-based tests can run
without first running "make install".


Changed Files:
U   trunk/src/config/post.in
U   trunk/src/config/pre.in
U   trunk/src/tests/t_anonpkinit.py
Modified: trunk/src/config/post.in
===================================================================
--- trunk/src/config/post.in	2010-03-15 04:45:47 UTC (rev 23804)
+++ trunk/src/config/post.in	2010-03-15 18:53:02 UTC (rev 23805)
@@ -139,8 +139,10 @@
 check-pytests-yes:
 	@pytests="$(PYTESTS)"; \
 	for t in $$pytests; do \
-		echo PYTHONPATH=$(top_srcdir)/util VALGRIND="$(VALGRIND)" \
+		echo "$(KRB5_RUN_ENV)" \
+			PYTHONPATH=$(top_srcdir)/util VALGRIND="$(VALGRIND)" \
 			$(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS); \
+		$(KRB5_RUN_ENV) \
 		PYTHONPATH=$(top_srcdir)/util VALGRIND="$(VALGRIND)" \
 			$(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS) || exit 1; \
 	done

Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in	2010-03-15 04:45:47 UTC (rev 23804)
+++ trunk/src/config/pre.in	2010-03-15 18:53:02 UTC (rev 23805)
@@ -396,6 +396,9 @@
 # eventually) but which we don't want to install.
 APPUTILS_LIB	= -lapputils
 
+# So test programs can find their libraries without "make install", etc.
+KRB5_RUN_ENV=@KRB5_RUN_ENV@
+
 #
 # variables for --with-tcl=
 TCL_LIBS	= @TCL_LIBS@

Modified: trunk/src/tests/t_anonpkinit.py
===================================================================
--- trunk/src/tests/t_anonpkinit.py	2010-03-15 04:45:47 UTC (rev 23804)
+++ trunk/src/tests/t_anonpkinit.py	2010-03-15 18:53:02 UTC (rev 23805)
@@ -3,7 +3,7 @@
 
 # Skip this test if pkinit wasn't built.
 if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
-    success()
+    success('Warning: not testing pkinit because it is not built.')
     exit(0)
 
 # Construct a krb5.conf fragment configuring pkinit.