aboutsummaryrefslogtreecommitdiff
path: root/tests/publish.test
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-08-14 19:28:54 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-08-14 19:28:54 +0300
commit8e5f53fd249f08b0be0a7d4eec65f425cfb79eae (patch)
tree247b5321b3fda46c390525fab1cc194e64c20ddb /tests/publish.test
parentfc9dbf81953ebe3b0757638671eb31787f4f387d (diff)
Adapt to git_version() returning semantic_version now
Diffstat (limited to 'tests/publish.test')
-rw-r--r--tests/publish.test15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/publish.test b/tests/publish.test
index 8541d9c..d8d86d8 100644
--- a/tests/publish.test
+++ b/tests/publish.test
@@ -4,6 +4,14 @@
.include common.test project.test
+# bdep-publish requirements for the minimum supported git version are higher
+# then the default 2.1 (see bdep/publish.cxx for details).
+#
++if! ($git_version_major > 2 || \
+ $git_version_major == 2 && $git_version_minor >= 12)
+ exit
+end
+
# Repository to use for the package submissions simulation.
#
# Note: could use empty config.bdep.test.repository value to suppress
@@ -24,12 +32,6 @@ 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.
@@ -230,7 +232,6 @@ git_supported = ($git_version_major > 2 || \
: control
:
-if ($git_supported)
{
# The control repository URL doesn't really matter for the submission
# simulation. We specify it to enable the control branch-related