diff options
| author | Christian Hesse | 2019-06-04 13:49:36 +0200 |
|---|---|---|
| committer | Christian Hesse | 2019-06-05 15:38:14 +0200 |
| commit | 27a6d69ab38825602bdbd5a5d0161e465326ea8d (patch) | |
| tree | 70e5c8832fe6041905ff25b2054cc3ce298ee1ea | |
| parent | git: update to v2.21.0 (diff) | |
| download | 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-x | tests/t0001-validate-git-versions.sh | 2 |
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' ' | |||
| 33 | sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && | 33 | sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && |
| 34 | cd git && | 34 | cd git && |
| 35 | git describe --match "v[0-9]*" $sm_sha1 | 35 | git describe --match "v[0-9]*" $sm_sha1 |
| 36 | ) | sed -e "s/^v//" >sm_version && | 36 | ) | sed -e "s/^v//" -e "s/-/./" >sm_version && |
| 37 | test_cmp sm_version makefile_version | 37 | test_cmp sm_version makefile_version |
| 38 | fi | 38 | fi |
| 39 | ' | 39 | ' |