projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto/gc-des: Fix recent regression.
[gnulib.git]
/
tests
/
test-rmdir.h
diff --git
a/tests/test-rmdir.h
b/tests/test-rmdir.h
index
a859739
..
476b307
100644
(file)
--- a/
tests/test-rmdir.h
+++ b/
tests/test-rmdir.h
@@
-1,5
+1,5
@@
/* Tests of rmdir.
/* Tests of rmdir.
- 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
@@
-25,9
+25,6
@@
static int
test_rmdir_func (int (*func) (char const *name), bool print)
{
static int
test_rmdir_func (int (*func) (char const *name), bool print)
{
- /* Remove any leftovers from a previous partial run. */
- ASSERT (system ("rm -rf " BASE "*") == 0);
-
/* Setup. */
ASSERT (mkdir (BASE "dir", 0700) == 0);
ASSERT (close (creat (BASE "dir/file", 0600)) == 0);
/* Setup. */
ASSERT (mkdir (BASE "dir", 0700) == 0);
ASSERT (close (creat (BASE "dir/file", 0600)) == 0);
@@
-69,7
+66,8
@@
test_rmdir_func (int (*func) (char const *name), bool print)
ASSERT (unlink (BASE "dir/file") == 0);
errno = 0;
ASSERT (func (BASE "dir/.//") == -1);
ASSERT (unlink (BASE "dir/file") == 0);
errno = 0;
ASSERT (func (BASE "dir/.//") == -1);
- ASSERT (errno == EINVAL || errno == EBUSY);
+ ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST
+ || errno == ENOTEMPTY);
ASSERT (func (BASE "dir") == 0);
/* Test symlink behavior. Specifying trailing slash should remove
ASSERT (func (BASE "dir") == 0);
/* Test symlink behavior. Specifying trailing slash should remove
@@
-80,8
+78,8
@@
test_rmdir_func (int (*func) (char const *name), bool print)
if (symlink (BASE "dir", BASE "link") != 0)
{
if (print)
if (symlink (BASE "dir", BASE "link") != 0)
{
if (print)
- fputs ("skipping test: symlinks not supported on this file system\n",
- stderr);
+
fputs ("skipping test: symlinks not supported on this file system\n",
+
stderr);
return 77;
}
ASSERT (mkdir (BASE "dir", 0700) == 0);
return 77;
}
ASSERT (mkdir (BASE "dir", 0700) == 0);