From 8e5f53fd249f08b0be0a7d4eec65f425cfb79eae Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 14 Aug 2018 19:28:54 +0300
Subject: Adapt to git_version() returning semantic_version now

---
 tests/common.test | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'tests/common.test')

diff --git a/tests/common.test b/tests/common.test
index f532d76..80d37d3 100644
--- a/tests/common.test
+++ b/tests/common.test
@@ -30,13 +30,10 @@ end
 +echo "$git_version" | sed -e 's/(\d+).*/\1/'      | set git_version_major
 +echo "$git_version" | sed -e 's/\d+\.(\d+).*/\1/' | set git_version_minor
 
-# This flag must be used by testscripts to decide if they should skip git
-# repository-related tests or adjust bdep commands. Note that specific command
-# tests may still adjust this flag to express the higher requirements for the
-# minimum supported git version.
-#
-git_supported = ($git_version_major >  2 || \
-		 $git_version_major == 2 && $git_version_minor >= 1)
++if! ($git_version_major >  2 || \
+      $git_version_major == 2 && $git_version_minor >= 1)
+  exit "minimum supported git version is 2.1"
+end
 
 # Helper commands that can be used by tests to prepare the testing environment
 # or validate an outcome of the command being tested. They are likely to get
@@ -50,7 +47,7 @@ clean   = $* clean
 deinit  = $* deinit
 init    = $* init
 fetch   = $* fetch
-new     = $* new --no-checks --vcs ($git_supported ? git : none)
+new     = $* new --no-checks
 status  = $* status
 sync    = $* sync
 update  = $* update
-- 
cgit v1.1