Merge branch 'develop' into fix/aarch64-strcmp-issue

ecmwf · Dec 25, 2024 · 4b4cf79 · 4b4cf79
2 parents 3dcda7f + 2cf7ebe
commit 4b4cf79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/value/test_value_string.cc b/tests/value/test_value_string.cc
@@ -190,8 +190,8 @@ CASE("Ensure a well defined ordering of strings with other Values()") {
     EXPECT(val1.compare(val2) == 0);
     EXPECT(val2.compare(val1) == 0);
 
-    EXPECT(val1.compare(val3) == -1);
-    EXPECT(val3.compare(val1) == 1);
+    EXPECT(val1.compare(val3) < 0);
+    EXPECT(val3.compare(val1) > 0);
 
     // Check comparisons with other types of data (see test_value_typeordering).
 

diff --git a/tests/value/test_value_typeordering.cc b/tests/value/test_value_typeordering.cc
@@ -73,11 +73,11 @@ CASE("Every type compares correctly against every other type") {
 
                 EXPECT(values[i] < values[j]);
                 EXPECT(!(values[i] >= values[j]));
-                EXPECT(values[i].compare(values[j]) == -1);
+                EXPECT(values[i].compare(values[j]) < 0);
 
                 EXPECT(values[j] >= values[i]);
                 EXPECT(!(values[j] < values[i]));
-                EXPECT(values[j].compare(values[i]) == 1);
+                EXPECT(values[j].compare(values[i]) > 0);
 
                 sanity_check++;
             }
@@ -123,11 +123,11 @@ CASE("Every type compares correctly against every other type") {
 
                 EXPECT(values[i] > values[j]);
                 EXPECT(!(values[i] <= values[j]));
-                EXPECT(values[i].compare(values[j]) == 1);
+                EXPECT(values[i].compare(values[j]) > 0);
 
                 EXPECT(values[j] <= values[i]);
                 EXPECT(!(values[j] > values[i]));
-                EXPECT(values[j].compare(values[i]) == -1);
+                EXPECT(values[j].compare(values[i]) < 0);
 
                 sanity_check++;
             }