[Cmake-commits] CMake branch, next, updated. v3.6.2-2017-g1576d2d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1576d2dc40abc74a9ae9c9cf7951f3003cf4ed9b (commit)
       via  884943251b16d3e34901a6533944e6b78ef8eb03 (commit)
      from  e8148b823b5dc6fabc65a705029540b125c496ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1576d2dc40abc74a9ae9c9cf7951f3003cf4ed9b
commit 1576d2dc40abc74a9ae9c9cf7951f3003cf4ed9b
Merge: e8148b8 8849432
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:10:57 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 09:10:57 2016 -0400

    Merge topic 'add-strverscmp' into next
    
    88494325 Tests: Add test for our strverscmp implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=884943251b16d3e34901a6533944e6b78ef8eb03
commit 884943251b16d3e34901a6533944e6b78ef8eb03
Author:     Pierluigi Taddei <pierluigi.taddei at gmail.com>
AuthorDate: Mon Sep 12 23:13:13 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 09:10:18 2016 -0400

    Tests: Add test for our strverscmp implementation
    
    Cover typical examples and the ordering defined by the `strverscmp(3)`
    man page.

diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx
index e834b93..5b5c8d2 100644
--- a/Tests/CMakeLib/testSystemTools.cxx
+++ b/Tests/CMakeLib/testSystemTools.cxx
@@ -19,6 +19,13 @@
   std::cout << "FAILED: " << (m) << "\n";                                     \
   failed = 1
 
+#define cmAssert(exp, m)                                                      \
+  if ((exp)) {                                                                \
+    cmPassed(m);                                                              \
+  } else {                                                                    \
+    cmFailed(m);                                                              \
+  }
+
 int testSystemTools(int /*unused*/, char* /*unused*/ [])
 {
   int failed = 0;
@@ -26,10 +33,67 @@ int testSystemTools(int /*unused*/, char* /*unused*/ [])
   // Test cmSystemTools::UpperCase
   std::string str = "abc";
   std::string strupper = "ABC";
-  if (cmSystemTools::UpperCase(str) == strupper) {
-    cmPassed("cmSystemTools::UpperCase is working");
-  } else {
-    cmFailed("cmSystemTools::UpperCase is working");
+  cmAssert(cmSystemTools::UpperCase(str) == strupper,
+           "cmSystemTools::UpperCase");
+
+  // ----------------------------------------------------------------------
+  // Test cmSystemTools::strverscmp
+  cmAssert(cmSystemTools::strverscmp("", "") == 0, "strverscmp empty string");
+  cmAssert(cmSystemTools::strverscmp("abc", "") > 0,
+           "strverscmp string vs empty string");
+  cmAssert(cmSystemTools::strverscmp("abc", "abc") == 0,
+           "strverscmp same string");
+  cmAssert(cmSystemTools::strverscmp("abd", "abc") > 0,
+           "strverscmp character string");
+  cmAssert(cmSystemTools::strverscmp("abc", "abd") < 0,
+           "strverscmp symmetric");
+  cmAssert(cmSystemTools::strverscmp("12345", "12344") > 0,
+           "strverscmp natural numbers");
+  cmAssert(cmSystemTools::strverscmp("100", "99") > 0,
+           "strverscmp natural numbers different digits");
+  cmAssert(cmSystemTools::strverscmp("12345", "00345") > 0,
+           "strverscmp natural against decimal (same length)");
+  cmAssert(cmSystemTools::strverscmp("99999999999999", "99999999999991") > 0,
+           "strverscmp natural overflow");
+  cmAssert(cmSystemTools::strverscmp("00000000000009", "00000000000001") > 0,
+           "strverscmp deciaml precision");
+  cmAssert(cmSystemTools::strverscmp("a.b.c.0", "a.b.c.000") > 0,
+           "strverscmp multiple zeros");
+  cmAssert(cmSystemTools::strverscmp("lib_1.2_10", "lib_1.2_2") > 0,
+           "strverscmp last number ");
+  cmAssert(cmSystemTools::strverscmp("12lib", "2lib") > 0,
+           "strverscmp first number ");
+  cmAssert(cmSystemTools::strverscmp("02lib", "002lib") > 0,
+           "strverscmp first number decimal ");
+  cmAssert(cmSystemTools::strverscmp("10", "9a") > 0,
+           "strverscmp letter filler ");
+  cmAssert(cmSystemTools::strverscmp("000", "0001") > 0,
+           "strverscmp zero and leading zeros  ");
+
+  // test sorting using standard strvercmp input
+  std::vector<std::string> testString;
+  testString.push_back("000");
+  testString.push_back("00");
+  testString.push_back("01");
+  testString.push_back("010");
+  testString.push_back("09");
+  testString.push_back("0");
+  testString.push_back("1");
+  testString.push_back("9");
+  testString.push_back("10");
+
+  // test global ordering of input strings
+  for (size_t i = 0; i < testString.size() - 1; i++) {
+    for (size_t j = i + 1; j < testString.size(); j++) {
+      if (cmSystemTools::strverscmp(testString[i], testString[j]) >= 0) {
+        cmFailed("cmSystemTools::strverscmp error in comparing strings " +
+                 testString[i] + " " + testString[j]);
+      }
+    }
+  }
+
+  if (!failed) {
+    cmPassed("cmSystemTools::strverscmp working");
   }
   return failed;
 }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake