2a30b8f4b2
Upstream commit: dcaf51b41e259387602774829c45222d0507f90a - elf: Change ldconfig auxcache magic number (bug 32231) - Make tst-strtod-underflow type-generic - Add crt1-2.0.o for glibc 2.0 compatibility tests - Add tests of more strtod special cases - Add more tests of strtod end pointer - Make tst-strtod2 and tst-strtod5 type-generic - powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) - Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) - Improve NaN payload testing - Make __strtod_internal tests type-generic - Fix strtod subnormal rounding (bug 30220) - More thoroughly test underflow / errno in tst-strtod-round - Test errno setting on strtod overflow in tst-strtod-round - Add tests of fread - stdio-common: Add new test for fdopen - libio: Attempt wide backup free only for non-legacy code - debug: Fix read error handling in pcprofiledump - elf: Fix tst-dlopen-tlsreinit1.out test dependency - elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) - elf: Clarify and invert second argument of _dl_allocate_tls_init - elf: Support recursive use of dynamic TLS in interposed malloc - nptl: Use <support/check.h> facilities in tst-setuid3 - posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64 - ungetc: Fix backup buffer leak on program exit [BZ #27821] - ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] - Make tst-ungetc use libsupport - stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] - support: Add FAIL test failure helper - string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) - Define __libc_initial for the static libc - x86: Fix bug in strchrnul-evex512 [BZ #32078] - Adjust check-local-headers test for libaudit 4.0 - x32/cet: Support shadow stack during startup for Linux 6.10 - x86-64: Remove sysdeps/x86_64/x32/dl-machine.h - support: Add options list terminator to the test driver - manual/stdio: Further clarify putc, putwc, getc, and getwc - Fix name space violation in fortify wrappers (bug 32052) - resolv: Fix tst-resolv-short-response for older GCC (bug 32042) - Add mremap tests - mremap: Update manual entry - linux: Update the mremap C implementation [BZ #31968] - Enhanced test coverage for strncmp, wcsncmp - Enhance test coverage for strnlen, wcsnlen Resolves: RHEL-57776 Resolves: RHEL-57777 Resolves: RHEL-61392
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
commit cae418638e83bcac4e65d612036edbd58f6e9364
|
|
Author: Maciej W. Rozycki <macro@redhat.com>
|
|
Date: Fri Jul 26 13:21:34 2024 +0100
|
|
|
|
posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64
|
|
|
|
Remove local FAIL macro in favor to FAIL_RET from <support/check.h>,
|
|
which provides equivalent reporting, with the name of the file of the
|
|
failure site additionally included, for the tst-truncate-common core
|
|
shared between the tst-truncate and tst-truncate64 tests.
|
|
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
(cherry picked from commit fe47595504a55e7bb992f8928533df154b510383)
|
|
|
|
diff --git a/posix/tst-truncate-common.c b/posix/tst-truncate-common.c
|
|
index b774fa46b80412b4..b8c561ffdb2b2903 100644
|
|
--- a/posix/tst-truncate-common.c
|
|
+++ b/posix/tst-truncate-common.c
|
|
@@ -21,6 +21,8 @@
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
+#include <support/check.h>
|
|
+
|
|
static void do_prepare (void);
|
|
#define PREPARE(argc, argv) do_prepare ()
|
|
static int do_test (void);
|
|
@@ -42,9 +44,6 @@ do_prepare (void)
|
|
}
|
|
}
|
|
|
|
-#define FAIL(str) \
|
|
- do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0)
|
|
-
|
|
static int
|
|
do_test_with_offset (off_t offset)
|
|
{
|
|
@@ -54,35 +53,35 @@ do_test_with_offset (off_t offset)
|
|
memset (buf, 0xcf, sizeof (buf));
|
|
|
|
if (pwrite (temp_fd, buf, sizeof (buf), offset) != sizeof (buf))
|
|
- FAIL ("write failed");
|
|
+ FAIL_RET ("write failed");
|
|
if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + sizeof (buf)))
|
|
- FAIL ("initial size wrong");
|
|
+ FAIL_RET ("initial size wrong");
|
|
|
|
if (ftruncate (temp_fd, offset + 800) < 0)
|
|
- FAIL ("size reduction with ftruncate failed");
|
|
+ FAIL_RET ("size reduction with ftruncate failed");
|
|
if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800))
|
|
- FAIL ("size after reduction with ftruncate is incorrect");
|
|
+ FAIL_RET ("size after reduction with ftruncate is incorrect");
|
|
|
|
/* The following test covers more than POSIX. POSIX does not require
|
|
that ftruncate() can increase the file size. But we are testing
|
|
Unix systems. */
|
|
if (ftruncate (temp_fd, offset + 1200) < 0)
|
|
- FAIL ("size increate with ftruncate failed");
|
|
+ FAIL_RET ("size increate with ftruncate failed");
|
|
if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200))
|
|
- FAIL ("size after increase is incorrect");
|
|
+ FAIL_RET ("size after increase is incorrect");
|
|
|
|
if (truncate (temp_filename, offset + 800) < 0)
|
|
- FAIL ("size reduction with truncate failed");
|
|
+ FAIL_RET ("size reduction with truncate failed");
|
|
if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800))
|
|
- FAIL ("size after reduction with truncate incorrect");
|
|
+ FAIL_RET ("size after reduction with truncate incorrect");
|
|
|
|
/* The following test covers more than POSIX. POSIX does not require
|
|
that truncate() can increase the file size. But we are testing
|
|
Unix systems. */
|
|
if (truncate (temp_filename, (offset + 1200)) < 0)
|
|
- FAIL ("size increase with truncate failed");
|
|
+ FAIL_RET ("size increase with truncate failed");
|
|
if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200))
|
|
- FAIL ("size increase with truncate is incorrect");
|
|
+ FAIL_RET ("size increase with truncate is incorrect");
|
|
|
|
return 0;
|
|
}
|