aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/release
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2015-07-30 09:32:19 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-07-30 11:32:53 +0000
commit6ac7bd5f917e2d32705e5990f31b015db6a251f2 (patch)
tree2fbf33299622ccc72d871f2f90c6340fe53306b5 /scripts/release
parentb9ac92ff3de7bcfa854a10350f1c228f7c5d66de (diff)
Fix //scripts/release:release_test
Fixes #341 -- MOS_MIGRATED_REVID=99458831
Diffstat (limited to 'scripts/release')
-rw-r--r--scripts/release/BUILD23
-rwxr-xr-xscripts/release/release_test.sh10
2 files changed, 16 insertions, 17 deletions
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.