From c3cc4f73a917eabaae870c70999c6c179c690875 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 14 Apr 2015 11:14:25 +0100
Subject: [PATCH] more travis poking

and fix a float comparison in test_threading
---
 .travis.yml            | 12 ++++++++----
 test/test_threading.sh |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 047b740f..17e9bbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,14 @@ language: cpp
 before_install:
   - sudo add-apt-repository ppa:lyrasis/precise-backports -y
   - sudo apt-get update -qq
-  - sudo apt-get install -qq automake gobject-introspection gtk-doc-tools libfftw3-dev libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff4-dev libxml2-dev swig libmagick++-dev bc libgsf-1-dev libcfitsio3-dev libgsl0-dev libmatio-dev
-  - sudo apt-get install -qq liborc-0.4-dev
-  - sudo apt-get install -qq python-dev python3-dev 
-  - sudo apt-get install python-gi-dev python3-gi
+  - sudo apt-get install automake gobject-introspection gtk-doc-tools 
+  - sudo apt-get install libfftw3-dev libglib2.0-dev libjpeg-turbo8-dev 
+  - sudo apt-get install libpng12-dev libwebp-dev libtiff4-dev libxml2-dev 
+  - sudo apt-get install swig libmagick++-dev bc libgsf-1-dev 
+  - sudo apt-get install libcfitsio3-dev libgsl0-dev libmatio-dev
+  - sudo apt-get install liborc-0.4-dev liblcms2-dev libopenslide-dev
+  - sudo apt-get install python-dev python3-dev 
+  - sudo apt-get install python-gi-dev python3-gi python-gi-cairo
 before_script:
   - ./bootstrap.sh
   - ./configure 
diff --git a/test/test_threading.sh b/test/test_threading.sh
index de42f64f..a5b47fa8 100755
--- a/test/test_threading.sh
+++ b/test/test_threading.sh
@@ -23,16 +23,16 @@ for tile in 10 64 128 512; do
 		vips subtract $tmp/t5.v $tmp/t7.v $tmp/t8.v
 		vips abs $tmp/t8.v $tmp/t9.v
 		max=$(vips max $tmp/t9.v)
-		if [ $max -gt 0 ]; then
+		if [ $(echo "$max > 0" | bc) -eq 1 ]; then
 			break
 		fi
 	done
-	if [ $max -gt 0 ]; then
+	if [ $(echo "$max > 0" | bc) -eq 1 ]; then
 		break
 	fi
 done
 
-if [ $max -gt 0 ]; then
+if [ $(echo "$max > 0" | bc) -eq 1 ]; then
 	echo error, max == $max
 	exit 1
 else