aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-12-25 21:13:59 +0200
committerRiccardo Spagni <ric@spagni.net>2017-12-25 21:13:59 +0200
commit2f09828ea8171b3740935c83a7fef7653c27c4c2 (patch)
tree885dcd3213c3188ed0ab5ce15070fb923be7e0ae /tests
parentMerge pull request #2888 (diff)
parentversion: add -master to master version (diff)
downloadmonero-2f09828ea8171b3740935c83a7fef7653c27c4c2.tar.xz
Merge pull request #2890
83b0f9e6 version: add -master to master version (moneromooo-monero) 493f7d09 util: allow non numeric version parts (moneromooo-monero)
Diffstat (limited to 'tests')
-rw-r--r--tests/unit_tests/vercmp.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/unit_tests/vercmp.cpp b/tests/unit_tests/vercmp.cpp
index d48dfdf7c..8f359585d 100644
--- a/tests/unit_tests/vercmp.cpp
+++ b/tests/unit_tests/vercmp.cpp
@@ -40,4 +40,6 @@ TEST(vercmp, two_one) { ASSERT_TRUE(tools::vercmp("2", "1") > 0); }
TEST(vercmp, ten_nine) { ASSERT_TRUE(tools::vercmp("10", "9") > 0); }
TEST(vercmp, one_dot_ten_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1.10", "1.9") > 0); }
TEST(vercmp, one_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1", "1.9") < 0); }
+TEST(vercmp, to_master) { ASSERT_TRUE(tools::vercmp("1.0", "1.0-master") < 0); }
+TEST(vercmp, from_master) { ASSERT_TRUE(tools::vercmp("1.0-master", "1.1") < 0); }