diff options
| author | Martin Matuska <martin@matuska.org> | 2019-04-13 21:51:03 +0200 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2019-04-13 21:54:29 +0200 |
| commit | b17df5e194724f7e83fa028471f00db1a78f511a (patch) | |
| tree | 7459ca085ab92ad808fd5fb333b536ab5539824e /test_utils/test_common.h | |
| parent | 40f72fed535be6a7236e91aef3aad641b71f9168 (diff) | |
| download | libarchive-b17df5e194724f7e83fa028471f00db1a78f511a.tar.gz | |
Windows symlink bugfixes and improvements
Treat targets ending with /. and /.. as directory symlinks
Explicitly test for file and directory symlinks
Improve debug output on test failure
Fix two memory allocations
Diffstat (limited to 'test_utils/test_common.h')
| -rw-r--r-- | test_utils/test_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test_utils/test_common.h b/test_utils/test_common.h index 154a6964..7538d8cb 100644 --- a/test_utils/test_common.h +++ b/test_utils/test_common.h @@ -220,8 +220,8 @@ assertion_is_not_hardlink(__FILE__, __LINE__, path1, path2) #define assertIsReg(pathname, mode) \ assertion_is_reg(__FILE__, __LINE__, pathname, mode) -#define assertIsSymlink(pathname, contents) \ - assertion_is_symlink(__FILE__, __LINE__, pathname, contents) +#define assertIsSymlink(pathname, contents, isdir) \ + assertion_is_symlink(__FILE__, __LINE__, pathname, contents, isdir) /* Create a directory, report error if it fails. */ #define assertMakeDir(dirname, mode) \ assertion_make_dir(__FILE__, __LINE__, dirname, mode) @@ -289,7 +289,7 @@ int assertion_is_dir(const char *, int, const char *, int); int assertion_is_hardlink(const char *, int, const char *, const char *); int assertion_is_not_hardlink(const char *, int, const char *, const char *); int assertion_is_reg(const char *, int, const char *, int); -int assertion_is_symlink(const char *, int, const char *, const char *); +int assertion_is_symlink(const char *, int, const char *, const char *, int); int assertion_make_dir(const char *, int, const char *, int); int assertion_make_file(const char *, int, const char *, int, int, const void *); int assertion_make_hardlink(const char *, int, const char *newpath, const char *); |