Merge pull request NixOS#13230 from NixOS/mergify/bp/2.29-maintenance/pr-13228

edolstra · web-flow · commit 0cd1fce3c3fd · 2025-05-19T16:46:37.000+02:00
libutil-tests/json-utils: fix -Werror=sign-compare error (backport NixOS#13228)
diff --git a/src/libutil-tests/json-utils.cc b/src/libutil-tests/json-utils.cc
@@ -131,7 +131,7 @@ TEST(getString, wrongAssertions) {
 TEST(getIntegralNumber, rightAssertions) {
     auto simple = R"({ "int": 0, "signed": -1 })"_json;
 
-    ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0);
+    ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0u);
     ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "int")), 0);
     ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "signed")), -1);
 }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ TEST(getString, wrongAssertions) {`
`131`	`131`	`TEST(getIntegralNumber, rightAssertions) {`
`132`	`132`	`auto simple = R"({ "int": 0, "signed": -1 })"_json;`
`133`	`133`
`134`		`- ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0);`
	`134`	`+ ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0u);`
`135`	`135`	`ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "int")), 0);`
`136`	`136`	`ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "signed")), -1);`
`137`	`137`	`}`