From c2ba93cb61e86fb08b60a665312255a07c84fdf2 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sat, 2 Oct 2021 18:06:45 -0400 Subject: [PATCH] tests: Ensure the git tag version check does not run for tarball builds Do not try to determine the latest git tag if we're not in a git repository in the first place. --- test/version.t | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/version.t b/test/version.t index f14cae931..63a09f900 100755 --- a/test/version.t +++ b/test/version.t @@ -90,13 +90,15 @@ class TestVersion(TestCase): # corresponding to "compiled from git" or "compiled from tarball" version = out.split() - if 2 >= len(version) > 0: - git = version[1] - git_expected = "({0})".format(self.slurp_git()) - self.assertEqual(git_expected, git) - else: - raise ValueError("Unexpected output from _version '{0}'".format( - out)) + # If we are within a git repository, check the tag version + if os.path.exists("../.git"): + if 2 >= len(version) > 0: + git = version[1] + git_expected = "({0})".format(self.slurp_git()) + self.assertEqual(git_expected, git) + else: + raise ValueError("Unexpected output from _version '{0}'".format( + out)) ver = version[0] ver_expected = self.slurp()