[libcxx-commits] [libcxx] r359104 - Fix a couple of tests that assumed that compare retunred -1/0/1 instead of <0/0/>0. Thanks to Jonathan Wakely for the report.

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Wed Apr 24 08:14:14 2019
New Revision: 359104

URL: http://llvm.org/viewvc/llvm-project?rev=359104&view=rev
Log:
Fix a couple of tests that assumed that compare retunred -1/0/1 instead of <0/0/>0. Thanks to Jonathan Wakely for the report.

Modified:
    libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp
    libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp
    libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp
    libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp

Modified: libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp?rev=359104&r1=359103&r2=359104&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp Wed Apr 24 08:14:14 2019
@@ -118,8 +118,8 @@ int main(int, char**)
     constexpr SV  sv1;
     constexpr SV  sv2 { "abcde", 5 };
     static_assert ( sv1.compare("") == 0, "" );
-    static_assert ( sv1.compare("abcde") == -1, "" );
-    static_assert ( sv2.compare("") == 1, "" );
+    static_assert ( sv1.compare("abcde") < 0, "" );
+    static_assert ( sv2.compare("") > 0, "" );
     static_assert ( sv2.compare("abcde") == 0, "" );
     }
 #endif

Modified: libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp?rev=359104&r1=359103&r2=359104&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp Wed Apr 24 08:14:14 2019
@@ -444,8 +444,8 @@ int main(int, char**)
     constexpr SV  sv1;
     constexpr SV  sv2 { "abcde", 5 };
     static_assert ( sv1.compare(0, 0, "") == 0, "" );
-    static_assert ( sv1.compare(0, 0, "abcde") == -1, "" );
-    static_assert ( sv2.compare(0, 2, "") == 1, "" );
+    static_assert ( sv1.compare(0, 0, "abcde") < 0, "" );
+    static_assert ( sv2.compare(0, 2, "") > 0, "" );
     static_assert ( sv2.compare(0, 6, "abcde") == 0, "" );
     }
 #endif

Modified: libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp?rev=359104&r1=359103&r2=359104&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp Wed Apr 24 08:14:14 2019
@@ -1345,7 +1345,7 @@ int main(int, char**) {
     constexpr SV  sv1;
     constexpr SV  sv2 { "abcdefghijklmnopqrst", 21 };
     static_assert ( sv1.compare(0, 0, "abcde", 0) == 0, "" );
-    static_assert ( sv1.compare(0, 0, "abcde", 1) == -1, "" );
+    static_assert ( sv1.compare(0, 0, "abcde", 1) < 0, "" );
     static_assert ( sv2.compare(0, 0, "abcde", 1, 0) == 0, "" );
     }
 #endif

Modified: libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp?rev=359104&r1=359103&r2=359104&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp Wed Apr 24 08:14:14 2019
@@ -5840,8 +5840,8 @@ int main(int, char**) {
     typedef std::basic_string_view<char, constexpr_char_traits<char>> SV;
     constexpr SV  sv1 { "abcde", 5 };
     static_assert ( sv1.compare(5, 1, "", 0, 0) == 0, "" );
-    static_assert ( sv1.compare(2, 4, "", 0, 0) == 1, "" );
-    static_assert ( sv1.compare(2, 4, "abcde", 3, 4) == -1, "" );
+    static_assert ( sv1.compare(2, 4, "", 0, 0) > 0, "" );
+    static_assert ( sv1.compare(2, 4, "abcde", 3, 4) < 0, "" );
     }
 #endif