projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
math tests: Cosmetics.
[gnulib.git]
/
tests
/
test-utimens.c
diff --git
a/tests/test-utimens.c
b/tests/test-utimens.c
index
a36f042
..
319900d
100644
(file)
--- a/
tests/test-utimens.c
+++ b/
tests/test-utimens.c
@@
-1,5
+1,5
@@
/* Tests of utimens.
/* Tests of utimens.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
-2011
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
@@
-24,17
+24,8
@@
#include <stdio.h>
#include <stdlib.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 "ignore-value.h"
+#include "macros.h"
#define BASE "test-utimens.t"
#define BASE "test-utimens.t"
@@
-42,11
+33,11
@@
#include "test-lutimens.h"
#include "test-utimens.h"
#include "test-lutimens.h"
#include "test-utimens.h"
-/* Wrap
gl_f
utimens to behave like futimens. */
+/* Wrap
fd
utimens to behave like futimens. */
static int
do_futimens (int fd, struct timespec const times[2])
{
static int
do_futimens (int fd, struct timespec const times[2])
{
- return
gl_f
utimens (fd, NULL, times);
+ return
fd
utimens (fd, NULL, times);
}
/* Test the use of file descriptors alongside a name. */
}
/* Test the use of file descriptors alongside a name. */
@@
-58,7
+49,7
@@
do_fdutimens (char const *name, struct timespec const times[2])
if (fd < 0)
fd = open (name, O_RDONLY);
errno = 0;
if (fd < 0)
fd = open (name, O_RDONLY);
errno = 0;
- result = fdutimens (
name, fd
, times);
+ result = fdutimens (
fd, name
, times);
if (0 <= fd)
{
int saved_errno = errno;
if (0 <= fd)
{
int saved_errno = errno;
@@
-76,7
+67,7
@@
main (void)
int result3; /* Skip because of no lutimens support. */
/* Clean up any trash from prior testsuite runs. */
int result3; /* Skip because of no lutimens support. */
/* Clean up any trash from prior testsuite runs. */
-
ASSERT (system ("rm -rf " BASE "*") == 0
);
+
ignore_value (system ("rm -rf " BASE "*")
);
result1 = test_utimens (utimens, true);
ASSERT (test_utimens (do_fdutimens, false) == result1);
result1 = test_utimens (utimens, true);
ASSERT (test_utimens (do_fdutimens, false) == result1);