projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update NEWS.stable
[gnulib.git]
/
tests
/
test-canonicalize.c
diff --git
a/tests/test-canonicalize.c
b/tests/test-canonicalize.c
index
463297f
..
a095e0e
100644
(file)
--- a/
tests/test-canonicalize.c
+++ b/
tests/test-canonicalize.c
@@
-1,5
+1,5
@@
/* Test of execution of file name canonicalization.
/* Test of execution of file name canonicalization.
- Copyright (C) 2007-20
09
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
11
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
@@
-29,33
+29,25
@@
#include <unistd.h>
#include "same-inode.h"
#include <unistd.h>
#include "same-inode.h"
-
-#if !HAVE_SYMLINK
-# define symlink(a,b) (-1)
-#endif
-
-#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 "t-can.tmp"
#define BASE "t-can.tmp"
+static void *
+null_ptr (void)
+{
+ return NULL;
+}
+
int
int
-main ()
+main (
void
)
{
/* Setup some hierarchy to be used by this test. Start by removing
any leftovers from a previous partial run. */
{
int fd;
{
/* Setup some hierarchy to be used by this test. Start by removing
any leftovers from a previous partial run. */
{
int fd;
-
ASSERT (system ("rm -rf " BASE " ise") == 0
);
+
ignore_value (system ("rm -rf " BASE " ise")
);
ASSERT (mkdir (BASE, 0700) == 0);
fd = creat (BASE "/tra", 0600);
ASSERT (0 <= fd);
ASSERT (mkdir (BASE, 0700) == 0);
fd = creat (BASE "/tra", 0600);
ASSERT (0 <= fd);
@@
-71,7
+63,7
@@
main ()
ASSERT (result2 != NULL);
ASSERT (strcmp (result1, result2) == 0);
ASSERT (strstr (result1, "/" BASE "/tra")
ASSERT (result2 != NULL);
ASSERT (strcmp (result1, result2) == 0);
ASSERT (strstr (result1, "/" BASE "/tra")
- == result1 + strlen (result1) - strlen ("/" BASE "/tra"));
+
== result1 + strlen (result1) - strlen ("/" BASE "/tra"));
free (result1);
free (result2);
errno = 0;
free (result1);
free (result2);
errno = 0;
@@
-83,7
+75,7
@@
main ()
ASSERT (result2 == NULL);
ASSERT (errno == ENOENT);
errno = 0;
ASSERT (result2 == NULL);
ASSERT (errno == ENOENT);
errno = 0;
- result1 = canonicalize_file_name (
NULL
);
+ result1 = canonicalize_file_name (
null_ptr ()
);
ASSERT (result1 == NULL);
ASSERT (errno == EINVAL);
errno = 0;
ASSERT (result1 == NULL);
ASSERT (errno == EINVAL);
errno = 0;
@@
-125,8
+117,8
@@
main ()
{
ASSERT (remove (BASE "/tra") == 0);
ASSERT (rmdir (BASE) == 0);
{
ASSERT (remove (BASE "/tra") == 0);
ASSERT (rmdir (BASE) == 0);
- fputs ("skipping test: symlinks not supported on this filesystem\n",
- stderr);
+ fputs ("skipping test: symlinks not supported on this file
system\n",
+
stderr);
return 77;
}
ASSERT (symlink ("bef", BASE "/plo") == 0);
return 77;
}
ASSERT (symlink ("bef", BASE "/plo") == 0);