projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: update
[gnulib.git]
/
tests
/
test-freading.c
diff --git
a/tests/test-freading.c
b/tests/test-freading.c
index
c4d5533
..
fee8228
100644
(file)
--- a/
tests/test-freading.c
+++ b/
tests/test-freading.c
@@
-1,5
+1,5
@@
/* Test of freading() function.
/* Test of freading() function.
- Copyright (C) 2007-20
08
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
10
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 published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,65
+18,47
@@
#include <config.h>
#include <config.h>
+/* None of the files accessed by this test are large, so disable the
+ fseek link warning if we are not using the gnulib fseek module. */
+#define _GL_NO_LARGE_FILES
#include "freading.h"
#include <stdio.h>
#include "freading.h"
#include <stdio.h>
-#include <stdlib.h>
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- fflush (stderr); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
#define TESTFILE "t-freading.tmp"
int
#define TESTFILE "t-freading.tmp"
int
-main ()
+main (
void
)
{
FILE *fp;
/* Create a file with some contents. Write-only file is never reading. */
fp = fopen (TESTFILE, "w");
{
FILE *fp;
/* Create a file with some contents. Write-only file is never reading. */
fp = fopen (TESTFILE, "w");
- if (fp == NULL)
- goto skip;
+ ASSERT (fp);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fwrite ("foobarsh", 1, 8, fp) < 8)
- goto skip;
+ ASSERT (fwrite ("foobarsh", 1, 8, fp) == 8);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fclose (fp))
- goto skip;
+ ASSERT (fclose (fp) == 0);
/* Open it in read-only mode. Read-only file is always reading. */
fp = fopen (TESTFILE, "r");
/* Open it in read-only mode. Read-only file is always reading. */
fp = fopen (TESTFILE, "r");
- if (fp == NULL)
- goto skip;
+ ASSERT (fp);
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fgetc (fp) != 'f')
- goto skip;
+ ASSERT (fgetc (fp) == 'f');
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fseek (fp, 2, SEEK_CUR))
- goto skip;
+ ASSERT (fseek (fp, 2, SEEK_CUR) == 0);
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fgetc (fp) != 'b')
- goto skip;
+ ASSERT (fgetc (fp) == 'b');
ASSERT (freading (fp));
fflush (fp);
ASSERT (freading (fp));
ASSERT (freading (fp));
fflush (fp);
ASSERT (freading (fp));
- if (fgetc (fp) != 'a')
- goto skip;
+ ASSERT (fgetc (fp) == 'a');
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fseek (fp, 0, SEEK_END))
- goto skip;
+ ASSERT (fseek (fp, 0, SEEK_END) == 0);
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fclose (fp))
- goto skip;
+ ASSERT (fclose (fp) == 0);
/* Open it in read-write mode. POSIX requires a reposition (fseek,
fsetpos, rewind) or EOF when transitioning from read to write;
/* Open it in read-write mode. POSIX requires a reposition (fseek,
fsetpos, rewind) or EOF when transitioning from read to write;
@@
-85,33
+67,25
@@
main ()
at EOF. */
/* First a scenario with only fgetc, fseek, fputc. */
fp = fopen (TESTFILE, "r+");
at EOF. */
/* First a scenario with only fgetc, fseek, fputc. */
fp = fopen (TESTFILE, "r+");
- if (fp == NULL)
- goto skip;
+ ASSERT (fp);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fgetc (fp) != 'f')
- goto skip;
+ ASSERT (fgetc (fp) == 'f');
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fseek (fp, 2, SEEK_CUR))
- goto skip;
+ ASSERT (fseek (fp, 2, SEEK_CUR) == 0);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
/* freading (fp) is undefined here, but fwriting (fp) is false. */
- if (fgetc (fp) != 'b')
- goto skip;
+ ASSERT (fgetc (fp) == 'b');
ASSERT (freading (fp));
/* This fseek call is necessary when switching from reading to writing.
See the description of fopen(), ISO C 99 7.19.5.3.(6). */
ASSERT (freading (fp));
/* This fseek call is necessary when switching from reading to writing.
See the description of fopen(), ISO C 99 7.19.5.3.(6). */
- if (fseek (fp, 0, SEEK_CUR) != 0)
- goto skip;
+ ASSERT (fseek (fp, 0, SEEK_CUR) == 0);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
/* freading (fp) is undefined here, but fwriting (fp) is false. */
- if (fputc ('x', fp) != 'x')
- goto skip;
+ ASSERT (fputc ('x', fp) == 'x');
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fseek (fp, 0, SEEK_END))
- goto skip;
+ ASSERT (fseek (fp, 0, SEEK_END) == 0);
/* freading (fp) is undefined here, because on some implementations (e.g.
glibc) fseek causes a buffer to be read.
fwriting (fp) is undefined as well. */
/* freading (fp) is undefined here, because on some implementations (e.g.
glibc) fseek causes a buffer to be read.
fwriting (fp) is undefined as well. */
- if (fclose (fp))
- goto skip;
+ ASSERT (fclose (fp) == 0);
/* Open it in read-write mode. POSIX requires a reposition (fseek,
fsetpos, rewind) or EOF when transitioning from read to write;
/* Open it in read-write mode. POSIX requires a reposition (fseek,
fsetpos, rewind) or EOF when transitioning from read to write;
@@
-120,53
+94,37
@@
main ()
at EOF. */
/* Here a scenario that includes fflush. */
fp = fopen (TESTFILE, "r+");
at EOF. */
/* Here a scenario that includes fflush. */
fp = fopen (TESTFILE, "r+");
- if (fp == NULL)
- goto skip;
+ ASSERT (fp);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fgetc (fp) != 'f')
- goto skip;
+ ASSERT (fgetc (fp) == 'f');
ASSERT (freading (fp));
ASSERT (freading (fp));
- if (fseek (fp, 2, SEEK_CUR))
- goto skip;
+ ASSERT (fseek (fp, 2, SEEK_CUR) == 0);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
/* freading (fp) is undefined here, but fwriting (fp) is false. */
- if (fgetc (fp) != 'b')
- goto skip;
+ ASSERT (fgetc (fp) == 'b');
ASSERT (freading (fp));
fflush (fp);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
ASSERT (freading (fp));
fflush (fp);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
- if (fgetc (fp) != 'x')
- goto skip;
+ ASSERT (fgetc (fp) == 'x');
ASSERT (freading (fp));
/* This fseek call is necessary when switching from reading to writing.
See the description of fopen(), ISO C 99 7.19.5.3.(6). */
ASSERT (freading (fp));
/* This fseek call is necessary when switching from reading to writing.
See the description of fopen(), ISO C 99 7.19.5.3.(6). */
- if (fseek (fp, 0, SEEK_CUR) != 0)
- goto skip;
+ ASSERT (fseek (fp, 0, SEEK_CUR) == 0);
/* freading (fp) is undefined here, but fwriting (fp) is false. */
/* freading (fp) is undefined here, but fwriting (fp) is false. */
- if (fputc ('z', fp) != 'z')
- goto skip;
+ ASSERT (fputc ('z', fp) == 'z');
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fseek (fp, 0, SEEK_END))
- goto skip;
+ ASSERT (fseek (fp, 0, SEEK_END) == 0);
/* freading (fp) is undefined here, because on some implementations (e.g.
glibc) fseek causes a buffer to be read.
fwriting (fp) is undefined as well. */
/* freading (fp) is undefined here, because on some implementations (e.g.
glibc) fseek causes a buffer to be read.
fwriting (fp) is undefined as well. */
- if (fclose (fp))
- goto skip;
+ ASSERT (fclose (fp) == 0);
/* Open it in append mode. Write-only file is never reading. */
fp = fopen (TESTFILE, "a");
/* Open it in append mode. Write-only file is never reading. */
fp = fopen (TESTFILE, "a");
- if (fp == NULL)
- goto skip;
+ ASSERT (fp);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fwrite ("bla", 1, 3, fp) < 3)
- goto skip;
+ ASSERT (fwrite ("bla", 1, 3, fp) == 3);
ASSERT (!freading (fp));
ASSERT (!freading (fp));
- if (fclose (fp))
- goto skip;
-
+ ASSERT (fclose (fp) == 0);
+ ASSERT (remove (TESTFILE) == 0);
return 0;
return 0;
-
- skip:
- fprintf (stderr, "Skipping test: file operations failed.\n");
- return 77;
}
}