Conditionalize tinderbox differences on TINDERBOX env var

Conditionalize tinderbox differences on TINDERBOX env var, which is set in the
tinderbox cron script

2 files changed, 10 insertions, 3 deletions

diff --git a/cronscript b/cronscript
index 3bb0853..fc96415 100755
--- a/cronscript
+++ b/cronscript
@@ -1,3 +1,5 @@
+export TINDERBOX=1
+
 # bring xorg.modules up-to-date
 cd /jhbuild/checkout/xorg/util/modular/
 git pull --rebase --quiet >/dev/null
diff --git a/jhbuildrc b/jhbuildrc
index 5d23973..153672f 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -3,7 +3,10 @@
 #
 
 moduleset = '/jhbuild/xorg.modules'
-modules = [ 'xwin', 'xorg', 'extras', 'tests' ]
+if 'TINDERBOX' in os.environ:
+	modules = [ 'xwin', 'xorg', 'extras', 'tests' ]
+else:
+	modules = [ 'xwin', 'xorg' ]
 
 # skip building stuff which isn't appropriate for target
 # skip building all drivers apart from xf86-video-dummy and xf86-video-nested
@@ -55,7 +58,8 @@ skip = [ 'appplewmproto', 'libAppleWM',
 	 'xf86-video-xgixp' ]
 
 build_policy = 'updated-deps'
-nopoison = True
+if 'TINDERBOX' in os.environ:
+	nopoison = True
 
 # source checkout, build and install directories
 checkoutroot = '/jhbuild/checkout'
@@ -107,4 +111,5 @@ module_autogenargs['pixman'] = autogenargs + ' --disable-openmp'
 noxvfb = True
 
 # always run 'make check'
-makecheck = True
+if 'TINDERBOX' in os.environ:
+	makecheck = True