From 27a6d69ab38825602bdbd5a5d0161e465326ea8d Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 4 Jun 2019 13:49:36 +0200 Subject: [PATCH] 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 --- tests/t0001-validate-git-versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 '