Skip to content

Commit c477c68

Browse files
committed
More portability fixes for integerset tests.
Use UINT64CONST for large constants.
1 parent 32f8ddf commit c477c68

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/test/modules/test_integerset/test_integerset.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ static const test_spec test_specs[] = {
7878
},
7979
{
8080
"single values, distance > 2^32", "1",
81-
10000000000L, 1000000
81+
UINT64CONST(10000000000), 1000000
8282
},
8383
{
8484
"clusters, distance > 2^32", "10101010",
85-
10000000000L, 10000000
85+
UINT64CONST(10000000000), 10000000
8686
},
8787
{
8888
"clusters, distance > 2^60", "10101010",
89-
2000000000000000000L,
89+
UINT64CONST(2000000000000000000),
9090
23 /* can't be much higher than this, or we
9191
* overflow uint64 */
9292
}
@@ -539,31 +539,31 @@ test_huge_distances(void)
539539
val = 0;
540540
values[num_values++] = val;
541541

542-
val += 1152921504606846976L - 1; /* 2^60 - 1 */
542+
val += UINT64CONST(1152921504606846976) - 1; /* 2^60 - 1 */
543543
values[num_values++] = val;
544544

545-
val += 1152921504606846976L - 1; /* 2^60 - 1 */
545+
val += UINT64CONST(1152921504606846976) - 1; /* 2^60 - 1 */
546546
values[num_values++] = val;
547547

548-
val += 1152921504606846976L; /* 2^60 */
548+
val += UINT64CONST(1152921504606846976); /* 2^60 */
549549
values[num_values++] = val;
550550

551-
val += 1152921504606846976L; /* 2^60 */
551+
val += UINT64CONST(1152921504606846976); /* 2^60 */
552552
values[num_values++] = val;
553553

554-
val += 1152921504606846976L; /* 2^60 */
554+
val += UINT64CONST(1152921504606846976); /* 2^60 */
555555
values[num_values++] = val;
556556

557-
val += 1152921504606846976L + 1; /* 2^60 + 1 */
557+
val += UINT64CONST(1152921504606846976) + 1; /* 2^60 + 1 */
558558
values[num_values++] = val;
559559

560-
val += 1152921504606846976L + 1; /* 2^60 + 1 */
560+
val += UINT64CONST(1152921504606846976) + 1; /* 2^60 + 1 */
561561
values[num_values++] = val;
562562

563-
val += 1152921504606846976L + 1; /* 2^60 + 1 */
563+
val += UINT64CONST(1152921504606846976) + 1; /* 2^60 + 1 */
564564
values[num_values++] = val;
565565

566-
val += 1152921504606846976L; /* 2^60 */
566+
val += UINT64CONST(1152921504606846976); /* 2^60 */
567567
values[num_values++] = val;
568568

569569
/* we're now very close to 2^64, so can't add large values anymore */

0 commit comments

Comments
 (0)