thomasvs - in flumotion/branches/platform-3: . common flumotion/test

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue May  8 14:55:59 2007
New Revision: 4886

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/common/trial.mk
   flumotion/branches/platform-3/env.in
   flumotion/branches/platform-3/flumotion/test/Makefile.am
Log:
Merged revisions 4745 via svnmerge from 
https://svn.fluendo.com/svn/flumotion/trunk

........
  r4745 | thomasvs | 2007-04-04 23:39:28 +0200 (Wed, 04 Apr 2007) | 8 lines
  
  	* common/trial.mk:
  	  Fix up the way we invoke trial to work for other projects too.
  	* env.in:
  	  Use common shell construct to prepend to PATH variables.
  	* flumotion/test/Makefile.am:
  	  Remove TRIAL_ENV var already set in trial.mk
........


Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue May  8 14:55:59 2007
@@ -1,5 +1,16 @@
 2007-05-08  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	merged from: trunk, 4750
+
+	* common/trial.mk:
+	  Fix up the way we invoke trial to work for other projects too.
+	* env.in:
+	  Use common shell construct to prepend to PATH variables.
+	* flumotion/test/Makefile.am:
+	  Remove TRIAL_ENV var already set in trial.mk
+
+2007-05-08  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	Patch by: Michael Smith, Andy Wingo
 	merged from: trunk, 4739-4740, 4741
 	* flumotion/ui/glade.py (flumotion_glade_custom_handler): Add a

Modified: flumotion/branches/platform-3/common/trial.mk
==============================================================================
--- flumotion/branches/platform-3/common/trial.mk	(original)
+++ flumotion/branches/platform-3/common/trial.mk	Tue May  8 14:55:59 2007
@@ -3,8 +3,12 @@
 
 TRIAL_ENV=$(top_srcdir)/env
 
+# FIXME: doing "trial flumotion.test" from this directory causes the
+# base package flumotion tests to run always, instead of
+# the current package
+
 trial: rm-trial-test-log
-	$(TRIAL_ENV) trial flumotion.test 2>&1				\
+	$(TRIAL_ENV) trial test_*.py 2>&1				\
 		| tee trial.test.log;					\
 	if test $${PIPESTATUS[0]} -eq 0;				\
 	then 								\

Modified: flumotion/branches/platform-3/env.in
==============================================================================
--- flumotion/branches/platform-3/env.in	(original)
+++ flumotion/branches/platform-3/env.in	Tue May  8 14:55:59 2007
@@ -3,17 +3,8 @@
 build_dir=`cd $(dirname $0) && pwd`
 src_dir=`cd $build_dir && cd @top_srcdir@ && pwd`
 
-if test -n "$PYTHONPATH"; then
-  export PYTHONPATH=$src_dir:$PYTHONPATH
-else
-  export PYTHONPATH=$src_dir
-fi  
-
-if test -n "$PKG_CONFIG_PATH"; then
-  export PKG_CONFIG_PATH=$build_dir/pkgconfig:$PKG_CONFIG_PATH
-else
-  export PKG_CONFIG_PATH=$build_dir/pkgconfig
-fi
+PYTHONPATH=$src_dir${PYTHONPATH:+:$PYTHONPATH}
+PKGCONFIGPATH=$src_dir${PKGCONFIGPATH:+:$PKGCONFIGPATH}
 
 export PATH=$build_dir/bin:$PATH
 export PACKAGES="@PACKAGE at -@VERSION@ $PACKAGES"

Modified: flumotion/branches/platform-3/flumotion/test/Makefile.am
==============================================================================
--- flumotion/branches/platform-3/flumotion/test/Makefile.am	(original)
+++ flumotion/branches/platform-3/flumotion/test/Makefile.am	Tue May  8 14:55:59 2007
@@ -57,5 +57,4 @@
 	test_wizard.py 			\
 	test_workerconfig.py
 
-TRIAL_ENV=$(top_builddir)/env
 check-local: trial