From b673c13257017eec3d7abee64e6abccad312da54 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 20 Oct 2015 14:23:45 -0700
Subject: [PATCH] Clean up tests

---
 test-v1.sh |  5 -----
 test-v2.sh | 20 --------------------
 test.sh    |  4 ++--
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/test-v1.sh b/test-v1.sh
index aef210f..598f05f 100644
--- a/test-v1.sh
+++ b/test-v1.sh
@@ -697,11 +697,6 @@ with_target_fails() {
 }
 runtest with_target_fails
 
-add_target_fails() {
-    exit 1
-}
-runtest add_target_fails
-
 echo
 echo "SUCCESS"
 echo
diff --git a/test-v2.sh b/test-v2.sh
index c36246d..88b3d27 100644
--- a/test-v2.sh
+++ b/test-v2.sh
@@ -894,26 +894,6 @@ with_host_in_multiple_targets() {
 }
 runtest with_host_in_multiple_targets
 
-add_target() {
-    exit 1
-}
-runtest add_target
-
-add_bogus_target() {
-    exit 1
-}
-runtest add_bogus_target
-
-add_existing_target() {
-    exit 1
-}
-runtest add_existing_target
-
-add_multiple_targets() {
-    exit 1
-}
-runtest add_multiple_targets
-
 update_with_extra_targets() {
     # Expect that additional stds get updated when updating an existing installation
     set_current_dist_date 2015-01-01
diff --git a/test.sh b/test.sh
index bb5a538..73acc86 100755
--- a/test.sh
+++ b/test.sh
@@ -8,10 +8,10 @@ echo
 echo "Running v1 metadata test suite"
 echo
 
-"$S/test-v1.sh" || return 1
+"$S/test-v1.sh" || exit 1
 
 echo
 echo "Running v2 metadata test suite"
 echo
 
-"$S/test-v2.sh" || return 1
+"$S/test-v2.sh" || exit 1