wingo - in flumotion/trunk: . common flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed Feb  7 17:00:16 2007
New Revision: 4467

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/common/trial.mk
   flumotion/trunk/flumotion/test/Makefile.am
Log:
2007-02-07  Andy Wingo  <wingo at pobox.com>

	* common/trial.mk (TRIAL_ENV): Make the environment that we run
	our tests in configurable, defaulting to top_srcdir.

	* flumotion/test/Makefile.am (TRIAL_ENV): Flumotion generates the
	env script, so set TRIAL_ENV to top_builddir.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Feb  7 17:00:16 2007
@@ -1,5 +1,11 @@
 2007-02-07  Andy Wingo  <wingo at pobox.com>
 
+	* common/trial.mk (TRIAL_ENV): Make the environment that we run
+	our tests in configurable, defaulting to top_srcdir.
+
+	* flumotion/test/Makefile.am (TRIAL_ENV): Flumotion generates the
+	env script, so set TRIAL_ENV to top_builddir.
+
 	* common/trial.mk (trial): Use the env script instead of mucking
 	with pythonpath. Other flumotion modules might need to add an env
 	script.

Modified: flumotion/trunk/common/trial.mk
==============================================================================
--- flumotion/trunk/common/trial.mk	(original)
+++ flumotion/trunk/common/trial.mk	Wed Feb  7 17:00:16 2007
@@ -1,8 +1,10 @@
 # add a trial target
 # include from flumotion/test/Makefile.am
 
+TRIAL_ENV=$(top_srcdir)/env
+
 trial: rm-trial-test-log
-	$(top_srcdir)/env trial flumotion.test 2>&1			\
+	$(TRIAL_ENV) trial flumotion.test 2>&1				\
 		| tee trial.test.log;					\
 	if test $${PIPESTATUS[0]} -eq 0;				\
 	then 								\

Modified: flumotion/trunk/flumotion/test/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/test/Makefile.am	(original)
+++ flumotion/trunk/flumotion/test/Makefile.am	Wed Feb  7 17:00:16 2007
@@ -1,6 +1,6 @@
 include $(top_srcdir)/common/python.mk
 include $(top_srcdir)/common/trial.mk
-                                                                                
+
 flumotiondir = $(libdir)/flumotion/python/flumotion/test
 
 flumotion_PYTHON =			\
@@ -55,4 +55,5 @@
 	test_wizard.py 			\
 	test_workerconfig.py
 
+TRIAL_ENV=$(top_builddir)/env
 check-local: trial