From 369c24f1d085a41ec274ebae5fc198fcee567653 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 7 Jun 2020 12:24:27 +0200 Subject: [PATCH] Update recommended gnulib commit --- README.Git | 13 +++++++++---- tests/language/lexer/scan-test.c | 4 ++-- tests/language/lexer/segment-test.c | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.Git b/README.Git index 68cc4d8f77..809bfe8711 100644 --- a/README.Git +++ b/README.Git @@ -36,11 +36,16 @@ This version of PSPP should work with the Gnulib commit shown below. Gnulib does not maintain a stable API or ABI, so it is possible that PSPP will not work with older or newer versions of Gnulib. - commit 9ce9be2ef0cb1180e35dfe9dfbbe90d774b374bd (HEAD, origin/master, origin/HEAD) - Author: Karl Berry - Date: Thu Jul 4 08:23:14 2019 -0700 - autoupdate + commit 1e972a8a37c153ddc15e604592f84f939eb3c2ad + Author: Bruno Haible + Date: Sat Jun 6 10:14:24 2020 +0200 + + calloc-gnu tests: Avoid a test failure with clang. + + * tests/test-calloc-gnu.c (main): Mark the pointer variable as + 'volatile', to defeat compiler optimizations. + To clone Gnulib into a directory named "gnulib" using Git, and then check out this particular commit, run these commands: diff --git a/tests/language/lexer/scan-test.c b/tests/language/lexer/scan-test.c index abbf0f9455..6f76d44f51 100644 --- a/tests/language/lexer/scan-test.c +++ b/tests/language/lexer/scan-test.c @@ -61,8 +61,8 @@ main (int argc, char *argv[]) /* Read from stdin into 'input'. */ input = (!strcmp (file_name, "-") - ? fread_file (stdin, &length) - : read_file (file_name, &length)); + ? fread_file (stdin, 0, &length) + : read_file (file_name, 0, &length)); if (input == NULL) error (EXIT_FAILURE, errno, "reading %s failed", file_name); diff --git a/tests/language/lexer/segment-test.c b/tests/language/lexer/segment-test.c index 2cd141cfe0..62db481426 100644 --- a/tests/language/lexer/segment-test.c +++ b/tests/language/lexer/segment-test.c @@ -73,8 +73,8 @@ main (int argc, char *argv[]) /* Read from stdin into 'input'. Ensure that 'input' ends in a new-line followed by a null byte. */ input = (!strcmp (file_name, "-") - ? fread_file (stdin, &length) - : read_file (file_name, &length)); + ? fread_file (stdin, 0, &length) + : read_file (file_name, 0, &length)); if (input == NULL) error (EXIT_FAILURE, errno, "reading %s failed", file_name); -- 2.30.2