projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'stable/20110609'
[gnulib.git]
/
tests
/
test-unlinkat.c
diff --git
a/tests/test-unlinkat.c
b/tests/test-unlinkat.c
index
8fa9643
..
f9ed249
100644
(file)
--- a/
tests/test-unlinkat.c
+++ b/
tests/test-unlinkat.c
@@
-1,5
+1,5
@@
/* Tests of unlinkat.
/* Tests of unlinkat.
- 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
@@
-20,6
+20,9
@@
#include <unistd.h>
#include <unistd.h>
+#include "signature.h"
+SIGNATURE_CHECK (unlinkat, int, (int, char const *, int));
+
#include <fcntl.h>
#include <errno.h>
#include <stdbool.h>
#include <fcntl.h>
#include <errno.h>
#include <stdbool.h>
@@
-28,18
+31,8
@@
#include <sys/stat.h>
#include "unlinkdir.h"
#include <sys/stat.h>
#include "unlinkdir.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-unlinkat.t"
#define BASE "test-unlinkat.t"
@@
-68,6
+61,10
@@
main (void)
/* FIXME: Add tests of fd other than ".". */
int result1;
int result2;
/* FIXME: Add tests of fd other than ".". */
int result1;
int result2;
+
+ /* Remove any leftovers from a previous partial run. */
+ ignore_value (system ("rm -rf " BASE "*"));
+
result1 = test_rmdir_func (rmdirat, false);
result2 = test_unlink_func (unlinker, false);
ASSERT (result1 == result2);
result1 = test_rmdir_func (rmdirat, false);
result2 = test_unlink_func (unlinker, false);
ASSERT (result1 == result2);
@@
-80,6
+77,6
@@
main (void)
ASSERT (close (dfd) == 0);
if (result1 == 77)
fputs ("skipping test: symlinks not supported on this file system\n",
ASSERT (close (dfd) == 0);
if (result1 == 77)
fputs ("skipping test: symlinks not supported on this file system\n",
- stderr);
+
stderr);
return result1;
}
return result1;
}