diff options
Diffstat (limited to 'fstests')
| -rw-r--r-- | fstests/ChangeLog | 47 | ||||
| -rw-r--r-- | fstests/fstests.c | 46 | ||||
| -rw-r--r-- | fstests/timertest.c | 24 |
3 files changed, 34 insertions, 83 deletions
diff --git a/fstests/ChangeLog b/fstests/ChangeLog deleted file mode 100644 index e7bbb31c..00000000 --- a/fstests/ChangeLog +++ /dev/null @@ -1,47 +0,0 @@ -Thu Jun 27 17:59:04 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> - - * Makefile (targets): Comment out opendisk for now. - -Mon Apr 29 16:43:44 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> - - * Makefile (OBJS): Delete variable. - -Thu Jul 6 21:03:12 1995 Michael I Bushnell <mib@duality.gnu.ai.mit.edu> - - * Makefile (OBJS): New var. - (timertest, fstests, opendisk, fdtests): List object files. - -Wed Aug 31 12:02:01 1994 Michael I Bushnell <mib@geech.gnu.ai.mit.edu> - - * Makefile (targets): Added opendisk. - (SRCS): Added opendisk.c. - * opendisk.c: New file. - -Wed Aug 31 03:26:13 1994 Roland McGrath <roland@churchy.gnu.ai.mit.edu> - - * fstests.c: Include unistd.h. - (main): #if 0 out unused variables. - -Tue Aug 16 13:55:04 1994 Roland McGrath <roland@churchy.gnu.ai.mit.edu> - - * timertest.c (main): Don't sigpause; instead getchar, so we are - blocked in an RPC when the signal arrives--do sigpause on EOF. - -Thu Jul 21 19:14:30 1994 Michael I Bushnell <mib@geech.gnu.ai.mit.edu> - - * Makefile: Rewritten to use new scheme. - -Tue Jul 19 12:43:00 1994 Michael I Bushnell (mib@churchy.gnu.ai.mit.edu) - - * Makefile (OBJS): Deleted variables. - (fstests, fdtests, timertest): Don't use variable $(link) anymore. - (install): Install all three programs. - -Tue Jul 5 14:20:48 1994 Michael I Bushnell (mib@churchy.gnu.ai.mit.edu) - - * Makefile (SRCS): New variable. - -Mon Jun 20 15:05:34 1994 Michael I Bushnell (mib@churchy.gnu.ai.mit.edu) - - * Makefile (install): Use $(INSTALL_BIN) instead of cp. - diff --git a/fstests/fstests.c b/fstests/fstests.c index 600eb3ef..4a0b35d5 100644 --- a/fstests/fstests.c +++ b/fstests/fstests.c @@ -1,5 +1,5 @@ /* Test filesystem behavior - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993,94,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -The GNU Hurd is distributed in the hope that it will be useful, +The GNU Hurd 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 General Public License for more details. @@ -27,6 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <hurd.h> #include <fcntl.h> #include <errno.h> +#include <error.h> #include <unistd.h> int check_refs (mach_port_t port) /* To call from gdb */ @@ -38,56 +39,57 @@ int check_refs (mach_port_t port) /* To call from gdb */ return err ? -err : refs; } -void +int main () { mach_port_t root; +#if HURDISH_TESTS extern file_t *_hurd_init_dtable; char string[] = "Did this get into the file?\n"; -#if 0 file_t filetowrite; retry_type retry; char pathbuf[1024]; int written; - int err; + error_t err; #endif root = getcrdir (); printf ("fstests running...\n"); -#if 0 +#if HURDISH_TESTS if ((err = dir_unlink (root, "CREATED")) && err != ENOENT) - printf ("Error on unlink: %d\n", err); - else if (err = dir_pathtrans (root, "CREATED", O_WRITE | O_CREAT, 0666, - &retry, pathbuf, &filetowrite)) - printf ("Error on pathtrans: %d\n", err); + error (0, err, "Error on unlink"); + else if (err = dir_lookup (root, "CREATED", O_WRITE | O_CREAT, 0666, + &retry, pathbuf, &filetowrite)) + error (0, err, "Error on lookup"); else if (err = io_write (filetowrite, string, strlen (string), -1, &written)) - printf ("Error on write: %d\n", err); + error (0, err, "Error on write"); else if (written != strlen (string)) - printf ("Short write: %d\n", written); + error (0, 0, "Short write: %d\n", written); else if (err = file_syncfs (filetowrite, 1, 0)) - printf ("Error on sync: %d\n", err); + error (0, err, "Error on sync"); #else if (unlink ("/newdir")) - perror ("unlink"); + error (0, errno, "unlink"); if (rmdir ("/newdir")) - perror ("1st rmdir"); + error (0, errno, "1st rmdir"); if (mkdir ("/newdir", 0777)) - perror ("1st mkdir"); + error (0, errno, "1st mkdir"); if (rename ("/newdir", "/newdir2")) - perror ("1st rename"); + error (0, errno, "1st rename"); if (rmdir ("/foo")) - perror ("2nd rmdir"); + error (0, errno, "2nd rmdir"); if (mkdir ("/foo", 0777)) - perror ("2nd mkdir"); + error (0, errno, "2nd mkdir"); if (rename ("/newdir2", "/foo")) - perror ("2nd rename"); - if (sync ()) - perror ("sync"); + error (0, errno, "2nd rename"); + sync (); #endif printf ("All done.\n"); malloc (0); + + return 0; } diff --git a/fstests/timertest.c b/fstests/timertest.c index 3c011fd9..2d602560 100644 --- a/fstests/timertest.c +++ b/fstests/timertest.c @@ -1,5 +1,5 @@ -/* - Copyright (C) 1994 Free Software Foundation +/* A test for the Hurd timer and getchar + Copyright (C) 1994,2001,02 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -18,6 +18,9 @@ #include <signal.h> #include <sys/time.h> #include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <error.h> void alarm_handler (int signo) @@ -27,7 +30,7 @@ alarm_handler (int signo) } int -main() +main(int argc, char *argv[]) { struct itimerval real_timer; @@ -35,14 +38,11 @@ main() real_timer.it_interval.tv_sec = 1; real_timer.it_value.tv_usec = 0; real_timer.it_value.tv_sec = 1; - + signal (SIGALRM, alarm_handler); - + if (setitimer (ITIMER_REAL, &real_timer, 0) < 0) - { - perror ("Setting timer"); - exit (1); - } + error (1, errno, "Setting timer"); while (1) { @@ -51,10 +51,7 @@ main() fflush (stdout); c = getchar (); if (ferror (stdin)) - { - perror ("getchar"); - exit (1); - } + error (1, errno, "getchar"); if (c == EOF) { puts ("Saw EOF. Pausing (no input)..."); @@ -65,4 +62,3 @@ main() printf ("Saw %.3o\n", c); } } - |