svn commit: trunk/uClibc/test/unistd
vapier at uclibc.org
vapier at uclibc.org
Tue Feb 14 05:01:49 UTC 2006
Author: vapier
Date: 2006-02-13 21:01:46 -0800 (Mon, 13 Feb 2006)
New Revision: 14000
Log:
sync with glibc
Added:
trunk/uClibc/test/unistd/tst-preadwrite64.c
Modified:
trunk/uClibc/test/unistd/Makefile
trunk/uClibc/test/unistd/tst-preadwrite.c
Changeset:
Modified: trunk/uClibc/test/unistd/Makefile
===================================================================
--- trunk/uClibc/test/unistd/Makefile 2006-02-14 05:01:25 UTC (rev 13999)
+++ trunk/uClibc/test/unistd/Makefile 2006-02-14 05:01:46 UTC (rev 14000)
@@ -1,7 +1,8 @@
# uClibc unistd tests
# Licensed under the GNU Library General Public License, see COPYING.LIB
-TESTS := clone errno fork getcwd getopt getopt_long tst-preadwrite tstgetopt vfork
+TESTS := clone errno fork getcwd getopt getopt_long tst-preadwrite \
+ tst-preadwrite64 tstgetopt vfork
include ../Test.mak
Modified: trunk/uClibc/test/unistd/tst-preadwrite.c
===================================================================
--- trunk/uClibc/test/unistd/tst-preadwrite.c 2006-02-14 05:01:25 UTC (rev 13999)
+++ trunk/uClibc/test/unistd/tst-preadwrite.c 2006-02-14 05:01:46 UTC (rev 14000)
@@ -18,132 +18,88 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <stdlib.h>
-#include <stdio.h>
-#include <search.h>
#include <errno.h>
#include <error.h>
#include <string.h>
#include <unistd.h>
-#define TESTFILE_NAME "CRAP.XXXXXX"
+
+/* Allow testing of the 64-bit versions as well. */
+#ifndef PREAD
+# define PREAD pread
+# define PWRITE pwrite
+#endif
+
#define STRINGIFY(s) STRINGIFY2 (s)
#define STRINGIFY2(s) #s
+/* Prototype for our test function. */
+extern void do_prepare (int argc, char *argv[]);
+extern int do_test (int argc, char *argv[]);
+
+/* We have a preparation function. */
+#define PREPARE do_prepare
+
+/* We might need a bit longer timeout. */
+#define TIMEOUT 20 /* sec */
+
+/* This defines the `main' function and some more. */
+#include <test-skeleton.c>
+
/* These are for the temporary file we generate. */
char *name;
int fd;
-
-/* Test the 32-bit versions first. */
-#define PREAD pread
-#define PWRITE pwrite
-
-int test(int argc, char *argv[])
+void
+do_prepare (int argc, char *argv[])
{
- char buf[1000];
- char res[1000];
- int i;
+ char name_len;
- memset (buf, '\0', sizeof (buf));
- memset (res, '\xff', sizeof (res));
+#define FNAME FNAME2(TRUNCATE)
+#define FNAME2(s) "/" STRINGIFY(s) "XXXXXX"
- if (write (fd, buf, sizeof (buf)) != sizeof (buf))
- error (EXIT_FAILURE, errno, "during write");
+ name_len = strlen (test_dir);
+ name = malloc (name_len + sizeof (FNAME));
+ if (name == NULL)
+ error (EXIT_FAILURE, errno, "cannot allocate file name");
+ mempcpy (mempcpy (name, test_dir, name_len), FNAME, sizeof (FNAME));
+ add_temp_file (name);
- for (i = 100; i < 200; ++i)
- buf[i] = i;
- if (PWRITE (fd, buf + 100, 100, 100) != 100)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
-
- for (i = 450; i < 600; ++i)
- buf[i] = i;
- if (PWRITE (fd, buf + 450, 150, 450) != 150)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
-
- if (PREAD (fd, res, sizeof (buf) - 50, 50) != sizeof (buf) - 50)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PREAD));
-
- close (fd);
- unlink (name);
- return memcmp (buf + 50, res, sizeof (buf) - 50);
+ /* Open our test file. */
+ fd = mkstemp (name);
+ if (fd == -1)
+ error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
}
-/* Test the 64-bit versions as well. */
-#if defined __UCLIBC_HAS_LFS__
-#undef PREAD
-#undef PWRITE
-#define PREAD pread64
-#define PWRITE pwrite64
-
-
-int test64(int argc, char *argv[])
+int
+do_test (int argc, char *argv[])
{
- char buf[1000];
- char res[1000];
- int i;
+ char buf[1000];
+ char res[1000];
+ int i;
- memset (buf, '\0', sizeof (buf));
- memset (res, '\xff', sizeof (res));
+ memset (buf, '\0', sizeof (buf));
+ memset (res, '\xff', sizeof (res));
- if (write (fd, buf, sizeof (buf)) != sizeof (buf))
- error (EXIT_FAILURE, errno, "during write");
+ if (write (fd, buf, sizeof (buf)) != sizeof (buf))
+ error (EXIT_FAILURE, errno, "during write");
- for (i = 100; i < 200; ++i)
- buf[i] = i;
- if (PWRITE (fd, buf + 100, 100, 100) != 100)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
+ for (i = 100; i < 200; ++i)
+ buf[i] = i;
+ if (PWRITE (fd, buf + 100, 100, 100) != 100)
+ error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
- for (i = 450; i < 600; ++i)
- buf[i] = i;
- if (PWRITE (fd, buf + 450, 150, 450) != 150)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
+ for (i = 450; i < 600; ++i)
+ buf[i] = i;
+ if (PWRITE (fd, buf + 450, 150, 450) != 150)
+ error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
- if (PREAD (fd, res, sizeof (buf) - 50, 50) != sizeof (buf) - 50)
- error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PREAD));
+ if (PREAD (fd, res, sizeof (buf) - 50, 50) != sizeof (buf) - 50)
+ error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PREAD));
- close (fd);
- unlink (name);
- return memcmp (buf + 50, res, sizeof (buf) - 50);
-}
-#endif
+ close (fd);
+ unlink (name);
-void prepare(void)
-{
- if (!name) {
- name = malloc (BUFSIZ);
- if (name == NULL)
- error (EXIT_FAILURE, errno, "cannot allocate file name");
- }
- strncpy(name, TESTFILE_NAME, BUFSIZ);
-
- /* Open our test file. */
- fd = mkstemp (name);
- if (fd == -1)
- error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
+ return memcmp (buf + 50, res, sizeof (buf) - 50);
}
-
-int main (int argc, char **argv)
-{
- int result = 0;
-
- prepare();
- result+=test(argc, argv);
- if (result) {
- fprintf(stderr, "pread/pwrite test failed.\n");
- return(EXIT_FAILURE);
- }
- fprintf(stderr, "pread/pwrite test successful.\n");
-
-#if defined __UCLIBC_HAS_LFS__
- prepare();
- result+=test64(argc, argv);
- if (result) {
- fprintf(stderr, "pread64/pwrite64 test failed.\n");
- return(EXIT_FAILURE);
- }
- fprintf(stderr, "pread64/pwrite64 test successful.\n");
-#endif
- return(EXIT_SUCCESS);
-}
Added: trunk/uClibc/test/unistd/tst-preadwrite64.c
===================================================================
--- trunk/uClibc/test/unistd/tst-preadwrite64.c 2006-02-14 05:01:25 UTC (rev 13999)
+++ trunk/uClibc/test/unistd/tst-preadwrite64.c 2006-02-14 05:01:46 UTC (rev 14000)
@@ -0,0 +1,24 @@
+/* Tests for pread64 and pwrite64.
+ Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper at cygnus.com>, 1998.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#define PREAD pread64
+#define PWRITE pwrite64
+
+#include "tst-preadwrite.c"
More information about the uClibc-cvs
mailing list