From d13ff4daf038e589ce8eb9c1ff96e43d3edaadce Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Sun, 3 Dec 2017 21:22:38 -0600
Subject: [PATCH] Move the trap instruction in /etc/ci/performance/test_all.sh.

---
 etc/ci/performance/test_all.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/ci/performance/test_all.sh b/etc/ci/performance/test_all.sh
index d62ddd5abeca..738fbc2204f6 100755
--- a/etc/ci/performance/test_all.sh
+++ b/etc/ci/performance/test_all.sh
@@ -43,6 +43,9 @@ fi
 echo "Starting the local server"
 python3 -m http.server > /dev/null 2>&1 &
 
+# Stop the local server no matter how we exit the script
+trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT
+
 # TODO: enable the full manifest when #11087 is fixed
 # https://github.com/servo/servo/issues/11087
 # MANIFEST="page_load_test/tp5n/20160509.manifest"
@@ -61,5 +64,3 @@ then
     python3 submit_to_s3.py "${PERF_FILE}" "${PERF_KEY}"
 fi
 
-echo "Stopping the local server"
-trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT