public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] libio: Update tst-wfile-sync to not depend on stdin Date: Tue, 12 Oct 2021 16:32:55 +0000 (GMT) [thread overview] Message-ID: <20211012163255.EFFAB385701A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8faa1e04493f23b16f473d21a3a5bc49b781ed2a commit 8faa1e04493f23b16f473d21a3a5bc49b781ed2a Author: Stafford Horne <shorne@gmail.com> Date: Wed Oct 6 08:31:12 2021 +0900 libio: Update tst-wfile-sync to not depend on stdin The test expects stdin to be a file which is not the case when running tests over ssh where stdin is piped in. The test fails with: error: xlseek.c:27: lseek64 (0, 0, 1): Illegal seek Update the test to create a temporary file and use that to perform the test. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Diff: --- libio/tst-wfile-sync.c | 27 ++++++++++++++++++++++++--- libio/tst-wfile-sync.input | 1 - 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libio/tst-wfile-sync.c b/libio/tst-wfile-sync.c index d279019349..f2415dbfca 100644 --- a/libio/tst-wfile-sync.c +++ b/libio/tst-wfile-sync.c @@ -16,22 +16,43 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <fcntl.h> #include <locale.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <wchar.h> #include <support/check.h> +#include <support/xstdio.h> #include <support/xunistd.h> +#include <support/temp_file.h> + +static const char test_data[] = "This is a test of _IO_wfile_sync."; static int do_test (void) { + static char *infile; + int infd; + FILE *infp; + + infd = create_temp_file ("tst-wfile-sync-in-", &infile); + xwrite (infd, test_data, strlen (test_data)); + xclose (infd); + + infd = xopen (infile, O_RDONLY, 0); + infp = fdopen (infd, "r"); + TEST_VERIFY_EXIT (setlocale (LC_ALL, "de_DE.UTF-8") != NULL); /* Fill the stdio buffer and advance the read pointer. */ - TEST_VERIFY_EXIT (fgetwc (stdin) != WEOF); + TEST_VERIFY_EXIT (fgetwc (infp) != WEOF); /* This calls _IO_wfile_sync, it should not crash. */ - TEST_VERIFY_EXIT (setvbuf (stdin, NULL, _IONBF, 0) == 0); + TEST_VERIFY_EXIT (setvbuf (infp, NULL, _IONBF, 0) == 0); /* Verify that the external file offset has been synchronized. */ - TEST_COMPARE (xlseek (0, 0, SEEK_CUR), 1); + TEST_COMPARE (xlseek (infd, 0, SEEK_CUR), 1); + + fclose (infp); + free (infile); return 0; } diff --git a/libio/tst-wfile-sync.input b/libio/tst-wfile-sync.input deleted file mode 100644 index 12d0958f7a..0000000000 --- a/libio/tst-wfile-sync.input +++ /dev/null @@ -1 +0,0 @@ -This is a test of _IO_wfile_sync.
reply other threads:[~2021-10-12 16:32 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211012163255.EFFAB385701A@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).