diff options
| author | Martin Matuska <martin@matuska.org> | 2017-02-22 00:45:43 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2017-02-22 01:05:12 +0100 |
| commit | d1dfc0fee096c78641951e5198fbc47fe16ffa2b (patch) | |
| tree | 79ab1b41bf4eb4aa41390437bb4574cc34debba5 /test_utils/test_common.h | |
| parent | 36e9d4b3c5f88913b62eeda6908e31326f46ad4c (diff) | |
| download | libarchive-d1dfc0fee096c78641951e5198fbc47fe16ffa2b.tar.gz | |
Improve verbosity of common functions for ACL tests
Diffstat (limited to 'test_utils/test_common.h')
| -rw-r--r-- | test_utils/test_common.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test_utils/test_common.h b/test_utils/test_common.h index 12702773..82e8483f 100644 --- a/test_utils/test_common.h +++ b/test_utils/test_common.h @@ -245,6 +245,12 @@ assertion_umask(__FILE__, __LINE__, mask) #define assertUtimes(pathname, atime, atime_nsec, mtime, mtime_nsec) \ assertion_utimes(__FILE__, __LINE__, pathname, atime, atime_nsec, mtime, mtime_nsec) +#ifndef PROGRAM +#define assertEntrySetAcls(entry, acls, count) \ + assertion_entry_set_acls(__FILE__, __LINE__, entry, acls, count) +#define assertEntryCompareAcls(entry, acls, count, type, mode) \ + assertion_entry_compare_acls(__FILE__, __LINE__, entry, acls, count, type, mode) +#endif /* * This would be simple with C99 variadic macros, but I don't want to @@ -385,11 +391,11 @@ struct archive_test_acl_t { }; /* Set ACLs */ -void archive_test_set_acls(struct archive_entry *, struct archive_test_acl_t *, - int); +int assertion_entry_set_acls(const char *, int, struct archive_entry *, + struct archive_test_acl_t *, int); /* Compare ACLs */ -void archive_test_compare_acls(struct archive_entry *, +int assertion_entry_compare_acls(const char *, int, struct archive_entry *, struct archive_test_acl_t *, int, int, int); /* Special customized read-from-memory interface. */ |