From e782412a03ac950aef600f6f69dce1b9187ac245 Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <ts@soundcloud.com>
Date: Fri, 16 Oct 2015 15:39:12 -0400
Subject: [PATCH] Improve end-to-end test output

---
 .travis.yml        | 2 +-
 end-to-end-test.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6c2040..d494a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,4 @@ script:
   - go vet
   - go test -v ./...
   - go build
-  - ./end-to-end-test.sh -v
+  - ./end-to-end-test.sh
diff --git a/end-to-end-test.sh b/end-to-end-test.sh
index fdfe480..aedc420 100755
--- a/end-to-end-test.sh
+++ b/end-to-end-test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set +euf +o pipefail
+set -euf +o pipefail
 
 cd "$(dirname $0)"
 
@@ -33,6 +33,11 @@ do
   esac
 done
 
+if [ ! -x ./node_exporter ]
+then
+    echo './node_exporter not found. Consider running `go build` first.' >&2
+    exit 1
+fi
 
 ./node_exporter \
   -collector.procfs="collector/fixtures/proc" \
@@ -62,6 +67,7 @@ finish() {
   then
     kill -9 "$(cat ${tmpdir}/node_exporter.pid)"
     # This silences the "Killed" message
+    set +e
     wait "$(cat ${tmpdir}/node_exporter.pid)" > /dev/null 2>&1
     rm -rf "${tmpdir}"
   fi