This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-920-gda616c1


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  da616c1496e2bd3022dbe4afdd162a80731c08ad (commit)
      from  216933b2422f1379809d30fbf403c0b047631ad8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=da616c1496e2bd3022dbe4afdd162a80731c08ad

commit da616c1496e2bd3022dbe4afdd162a80731c08ad
Author: Florian Weimer <fweimer@redhat.com>
Date:   Tue Dec 5 15:08:59 2017 +0100

    support/tst-test_compare: Fix 32-bit/64-bit expected output mismatch
    
    The use of a long type resulted in test output differences between
    32-bit and 64-bit architectures, causing the test to fail on 32-bit
    architectures.

diff --git a/ChangeLog b/ChangeLog
index cde2321..50ae82b 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 e4dcfd4..de138d4 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.  */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    7 +++++++
 support/tst-test_compare.c |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]