From 7a6c15e8ff135fc6b22b09038454d007da9642f4 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 11 Aug 2018 22:25:39 +0300 Subject: Make get-related functions to take minimum supported version as an argument --- tests/common.test | 9 ++++++--- tests/publish.test | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/common.test b/tests/common.test index 46f4abc..f532d76 100644 --- a/tests/common.test +++ b/tests/common.test @@ -15,7 +15,8 @@ build = $recall($build.path) test.options += --build $build -# Check that git version is the minimum supported one (2.12.0) or above. +# Check that git version is the minimum supported one or above. The lowest +# common denominator for bdep commands is 2.1. # +git --version | set git_version_out @@ -30,10 +31,12 @@ end +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. +# 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 >= 12) + $git_version_major == 2 && $git_version_minor >= 1) # 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 diff --git a/tests/publish.test b/tests/publish.test index dbdcabd..8541d9c 100644 --- a/tests/publish.test +++ b/tests/publish.test @@ -24,6 +24,12 @@ init += $cxx -d prj 2>! &prj/**/bootstrap/*** windows = ($cxx.target.class == 'windows') +# bdep-publish requirements for the minimum supported git version are higher +# then the default 2.1 (see bdep/publish.cxx for details). +# +git_supported = ($git_version_major > 2 || \ + $git_version_major == 2 && $git_version_minor >= 12) + # Note that using the same package name and version for tests may result in # duplicate submissions. We will use unique version for each test, # incrementing the patch version for 1.0.X. -- cgit v1.1