From 6ac7bd5f917e2d32705e5990f31b015db6a251f2 Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Thu, 30 Jul 2015 09:32:19 +0000
Subject: Fix //scripts/release:release_test

Fixes #341

--
MOS_MIGRATED_REVID=99458831
---
 scripts/release/BUILD           | 23 +++++++++++------------
 scripts/release/release_test.sh | 10 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'scripts/release')

diff --git a/scripts/release/BUILD b/scripts/release/BUILD
index 364c1ec128..7ccd9d5596 100644
--- a/scripts/release/BUILD
+++ b/scripts/release/BUILD
@@ -30,15 +30,14 @@ sh_library(
     deps = [":relnotes"],
 )
 
-# Disabled because currently fails.
-#sh_test(
-#    name = "release_test",
-#    srcs = ["release_test.sh"],
-#    data = [
-#        "testenv.sh",
-#        "//:git",
-#        "//src/test/shell:bashunit",
-#    ],
-#    tags = ["need_git"],
-#    deps = [":release"],
-#)
+sh_test(
+    name = "release_test",
+    srcs = ["release_test.sh"],
+    data = [
+        "testenv.sh",
+        "//:git",
+        "//src/test/shell:bashunit",
+    ],
+    tags = ["need_git"],
+    deps = [":release"],
+)
diff --git a/scripts/release/release_test.sh b/scripts/release/release_test.sh
index dc3b2c5956..4c2606800e 100755
--- a/scripts/release/release_test.sh
+++ b/scripts/release/release_test.sh
@@ -195,21 +195,21 @@ EOF
   local header='Release v1 ('$(date +%Y-%m-%d)')
 
 Baseline: 1170dc6
-   + 0540fde: Extract version numbers that look like "..._1.2.3_..."
-              from BUILD_EMBED_LABEL into Info.plist.
+   + 0540fde: Extract version numbers that look like
+              "..._1.2.3_..." from BUILD_EMBED_LABEL into Info.plist.
 
 '
   assert_equals "${header}Test replacement" "$(cat ${TEST_log})"
   push
 
   # Test creating a second candidate
-  echo "#!/usr/bin/true" >${EDITOR}
+  echo "#!$(which true)" >${EDITOR}
   create v1 1170dc6 0540fde cef25c4
   header='Release v1 ('$(date +%Y-%m-%d)')
 
 Baseline: 1170dc6
-   + 0540fde: Extract version numbers that look like "..._1.2.3_..."
-              from BUILD_EMBED_LABEL into Info.plist.
+   + 0540fde: Extract version numbers that look like
+              "..._1.2.3_..." from BUILD_EMBED_LABEL into Info.plist.
    + cef25c4: RELNOTES: Attribute error messages related to Android
               resources are easier to understand now.
 
-- 
cgit v1.2.3