projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configmake: fix make -q problem
[pspp]
/
tests
/
test-renameat.c
diff --git
a/tests/test-renameat.c
b/tests/test-renameat.c
index 687700e1bec515b42075432b24cae619a5bbc772..96fe3a7555e86b66dd4d1dad0af03854808fd382 100644
(file)
--- a/
tests/test-renameat.c
+++ b/
tests/test-renameat.c
@@
-1,5
+1,5
@@
/* Tests of renameat.
/* Tests of renameat.
- Copyright (C) 2009
, 2010
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
@@
-23,15
+23,17
@@
#include "signature.h"
SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *));
#include "signature.h"
SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *));
+#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
#include "filenamecat.h"
#include "filenamecat.h"
-#include "
xgetcwd
.h"
+#include "
ignore-value
.h"
#include "macros.h"
#define BASE "test-renameat.t"
#include "macros.h"
#define BASE "test-renameat.t"
@@
-57,7
+59,7
@@
main (void)
int result;
/* Clean up any trash from prior testsuite runs. */
int result;
/* Clean up any trash from prior testsuite runs. */
-
system ("rm -rf " BASE "*"
);
+
ignore_value (system ("rm -rf " BASE "*")
);
/* Test basic rename functionality, using current directory. */
result = test_rename (do_rename, false);
/* Test basic rename functionality, using current directory. */
result = test_rename (do_rename, false);
@@
-76,7
+78,8
@@
main (void)
dfd = creat (BASE "00", 0600);
ASSERT (0 <= dfd);
ASSERT (close (dfd) == 0);
dfd = creat (BASE "00", 0600);
ASSERT (0 <= dfd);
ASSERT (close (dfd) == 0);
- cwd = xgetcwd ();
+ cwd = getcwd (NULL, 0);
+ ASSERT (cwd);
dfd = open (BASE "sub1", O_RDONLY);
ASSERT (0 <= dfd);
dfd = open (BASE "sub1", O_RDONLY);
ASSERT (0 <= dfd);
@@
-130,7
+133,7
@@
main (void)
|| errno == ENOTEMPTY);
errno = 0;
ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1);
|| errno == ENOTEMPTY);
errno = 0;
ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1);
- ASSERT (errno == EINVAL || errno == EBUSY);
+ ASSERT (errno == EINVAL || errno == EBUSY
|| errno == EEXIST
);
errno = 0;
ASSERT (renameat (dfd, BASE "17", dfd, BASE "sub1") == -1);
ASSERT (errno == EISDIR);
errno = 0;
ASSERT (renameat (dfd, BASE "17", dfd, BASE "sub1") == -1);
ASSERT (errno == EISDIR);