summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2019-06-04 11:49:36 +0000
committerChristian Hesse <mail@eworm.de>2019-06-05 13:38:14 +0000
commit27a6d69ab38825602bdbd5a5d0161e465326ea8d (patch)
tree70e5c8832fe6041905ff25b2054cc3ce298ee1ea
parent985fba80d06f37fdba5e72d738ce21ab5ab5a76d (diff)
downloadcgit-27a6d69ab38825602bdbd5a5d0161e465326ea8d.tar
cgit-27a6d69ab38825602bdbd5a5d0161e465326ea8d.tar.gz
cgit-27a6d69ab38825602bdbd5a5d0161e465326ea8d.zip
tests: successfully validate rc versions
For testing versions the version string differs for git tag (v2.22.0-rc3) and tarball file name (2.22.0.rc3). Let's fix validation for testing versions. Signed-off-by: Christian Hesse <mail@eworm.de>
-rwxr-xr-xtests/t0001-validate-git-versions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh
index a65b35e..3200f31 100755
--- a/tests/t0001-validate-git-versions.sh
+++ b/tests/t0001-validate-git-versions.sh
@@ -33,7 +33,7 @@ test_expect_success 'test submodule version matches Makefile' '
sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
cd git &&
git describe --match "v[0-9]*" $sm_sha1
- ) | sed -e "s/^v//" >sm_version &&
+ ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
test_cmp sm_version makefile_version
fi
'