Fixed 64 bit %p testcase, again

mpaland · mpaland · commit f65dd08b1a02 · 2017-11-23T12:21:27.000+01:00
diff --git a/test/test_suite.cpp b/test/test_suite.cpp
@@ -977,14 +977,14 @@ TEST_CASE("pointer", "[]" ) {
     REQUIRE(!strcmp(buffer, "0000000012345678"));
   }
 
-  if (sizeof(void*) == sizeof(long)) {
-    test::sprintf(buffer, "%p", (void*)(long)0xFFFFFFFFU);
-    REQUIRE(!strcmp(buffer, "FFFFFFFF"));
-  }
-  else {
+  if (sizeof(uintptr_t) == sizeof(long long)) {
     test::sprintf(buffer, "%p", (void*)(unsigned long long)0xFFFFFFFFU);
     REQUIRE(!strcmp(buffer, "00000000FFFFFFFF"));
   }
+  else {
+    test::sprintf(buffer, "%p", (void*)(unsigned long)0xFFFFFFFFU);
+    REQUIRE(!strcmp(buffer, "FFFFFFFF"));
+  }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -977,14 +977,14 @@ TEST_CASE("pointer", "[]" ) {`
`977`	`977`	`REQUIRE(!strcmp(buffer, "0000000012345678"));`
`978`	`978`	`}`
`979`	`979`
`980`		`- if (sizeof(void*) == sizeof(long)) {`
`981`		`- test::sprintf(buffer, "%p", (void*)(long)0xFFFFFFFFU);`
`982`		`- REQUIRE(!strcmp(buffer, "FFFFFFFF"));`
`983`		`- }`
`984`		`- else {`
	`980`	`+ if (sizeof(uintptr_t) == sizeof(long long)) {`
`985`	`981`	`test::sprintf(buffer, "%p", (void*)(unsigned long long)0xFFFFFFFFU);`
`986`	`982`	`REQUIRE(!strcmp(buffer, "00000000FFFFFFFF"));`
`987`	`983`	`}`
	`984`	`+ else {`
	`985`	`+ test::sprintf(buffer, "%p", (void*)(unsigned long)0xFFFFFFFFU);`
	`986`	`+ REQUIRE(!strcmp(buffer, "FFFFFFFF"));`
	`987`	`+ }`
`988`	`988`	`}`
`989`	`989`
`990`	`990`