projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: improve diagnostic when an assertion fails
[gnulib.git]
/
tests
/
test-rename.c
diff --git
a/tests/test-rename.c
b/tests/test-rename.c
index
1cd2e8f
..
132c788
100644
(file)
--- a/
tests/test-rename.c
+++ b/
tests/test-rename.c
@@
-1,9
+1,9
@@
/* Test of rename() function.
/* Test of rename() function.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
-2013
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
- the Free Software Foundation; either version
2
of the License, or
+ the Free Software Foundation; either version
3
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-21,6
+21,7
@@
#include "signature.h"
SIGNATURE_CHECK (rename, int, (char const *, char const *));
#include "signature.h"
SIGNATURE_CHECK (rename, int, (char const *, char const *));
+#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
#include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
@@
-29,17
+30,8
@@
SIGNATURE_CHECK (rename, int, (char const *, char const *));
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.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-rename.t"
#define BASE "test-rename.t"
@@
-49,7
+41,7
@@
int
main (void)
{
/* Remove any garbage left from previous partial runs. */
main (void)
{
/* Remove any garbage left from previous partial runs. */
-
ASSERT (system ("rm -rf " BASE "*") == 0
);
+
ignore_value (system ("rm -rf " BASE "*")
);
return test_rename (rename, true);
}
return test_rename (rename, true);
}