From e50bbd5d5c62f5b05a30c1d0c09108821ea1d446 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 8 Oct 2013 00:18:36 -0700
Subject: [PATCH] Minor Travis config cleanup

---
 .travis.yml          | 16 ++++++++--------
 src/postgres/test.rs |  1 +
 travis/setup.sh      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a713a256..8c2b2d3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 before_install:
-    - yes | sudo add-apt-repository ppa:hansjorg/rust
-    - sudo apt-get update
+  - yes | sudo add-apt-repository ppa:hansjorg/rust
+  - sudo apt-get update
 install:
-    - sudo apt-get install rust-nightly
+  - sudo apt-get install rust-nightly
 before_script:
-    - ./travis/setup.sh
+  - ./travis/setup.sh
 script:
-    - rustc --lib --out-dir . src/postgres/lib.rs
-    - rustc --test --out-dir . -L. --cfg travis src/postgres/test.rs
-    - ./test
-#    - rustpkg test postgres
+  - rustc --lib --out-dir . src/postgres/lib.rs
+  - rustc --test --out-dir . -L. --cfg travis src/postgres/test.rs
+  - ./test
+#  - rustpkg test postgres
diff --git a/src/postgres/test.rs b/src/postgres/test.rs
index 35533a45..c3487f5a 100644
--- a/src/postgres/test.rs
+++ b/src/postgres/test.rs
@@ -5,6 +5,7 @@ use extra::comm::DuplexStream;
 use extra::future::Future;
 use extra::time;
 use extra::time::Timespec;
+#[cfg(not(travis))] // Travis uses Postgres 9.1
 use extra::json;
 use extra::uuid::Uuid;
 use std::f32;
diff --git a/travis/setup.sh b/travis/setup.sh
index 4fb09fe1..f8f5561a 100755
--- a/travis/setup.sh
+++ b/travis/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ev
+set -e
 
 cd "$(dirname "$0")"