From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
 id EFFAB385701A; Tue, 12 Oct 2021 16:32:55 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFFAB385701A
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] libio: Update tst-wfile-sync to not depend on stdin
X-Act-Checkin: glibc
X-Git-Author: Stafford Horne <shorne@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 171ab1af562836dd9c56756922efb69eafa9eb5c
X-Git-Newrev: 8faa1e04493f23b16f473d21a3a5bc49b781ed2a
Message-Id: <20211012163255.EFFAB385701A@sourceware.org>
Date: Tue, 12 Oct 2021 16:32:55 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Oct 2021 16:32:56 -0000

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.