aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--support/tst-test_compare.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cde2321373..50ae82ba1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-12-05 Florian Weimer <fweimer@redhat.com>
+
+ * support/tst-test_compare.c (subprocess): Use long long instead
+ of long argument for consistent type width across 32-bit and
+ 64-bit architectures.
+ (do_test): Adjust expected output.
+
2017-12-05 Joseph Myers <joseph@codesourcery.com>
* sysdeps/powerpc/fpu/s_cosf.c: Include <libm-alias-float.h>.
diff --git a/support/tst-test_compare.c b/support/tst-test_compare.c
index e4dcfd462a..de138d4f8a 100644
--- a/support/tst-test_compare.c
+++ b/support/tst-test_compare.c
@@ -27,7 +27,7 @@ subprocess (void *closure)
/* These tests should fail. */
TEST_COMPARE (ch, -1); /* Line 28. */
TEST_COMPARE (2LL, -2LL); /* Line 29. */
- TEST_COMPARE (3L, (short) -3); /* Line 30. */
+ TEST_COMPARE (3LL, (short) -3); /* Line 30. */
}
struct bitfield
@@ -86,7 +86,7 @@ do_test (void)
" right: -2 (0xfffffffffffffffe); from: -2LL\n"
"tst-test_compare.c:30: numeric comparison failure"
" (widths 64 and 32)\n"
- " left: 3 (0x3); from: 3L\n"
+ " left: 3 (0x3); from: 3LL\n"
" right: -3 (0xfffffffd); from: (short) -3\n") == 0);
/* Check that there is no output on standard error. */