]> git.cameronkatri.com Git - cgit.git/commitdiff
tests: successfully validate rc versions
authorChristian Hesse <mail@eworm.de>
Tue, 4 Jun 2019 11:49:36 +0000 (13:49 +0200)
committerChristian Hesse <mail@eworm.de>
Wed, 5 Jun 2019 13:38:14 +0000 (15:38 +0200)
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>
tests/t0001-validate-git-versions.sh

index a65b35e5d294d9cfd239d48460518539bf5e60ae..3200f31101a0c2c94963a24291bd176a251ab4bd 100755 (executable)
@@ -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/^[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
 '
                test_cmp sm_version makefile_version
        fi
 '