diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-09-17 09:17:53 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-09-17 09:17:53 -0400 |
| commit | a47d12c64d51edf702d7beaefb1f8ca97e8dd0f5 (patch) | |
| tree | 2ed5e6bad3d0cf4102454162672937a20d27847b /src | |
| parent | 7eef9ced61e72b1df02d3e9629d21e717fff74f7 (diff) | |
| parent | 4e8cb410a7db74b8099df3e17f38344e8201913b (diff) | |
| download | tor-a47d12c64d51edf702d7beaefb1f8ca97e8dd0f5.tar.gz tor-a47d12c64d51edf702d7beaefb1f8ca97e8dd0f5.zip | |
Merge branch 'tor-gitlab/mr/129'
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_util.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 3ce7103ade..1c555e4d06 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4476,11 +4476,11 @@ test_util_glob(void *ptr) tor_asprintf(&forbidden_forbidden, "%s"PATH_SEPARATOR"forbidden"PATH_SEPARATOR"forbidden",dirname); #ifndef _WIN32 - chmod(forbidden, 0700); + tt_int_op(0, OP_EQ, chmod(forbidden, 0700)); #endif tt_int_op(0, OP_EQ, create_test_directory_structure(forbidden)); #ifndef _WIN32 - chmod(forbidden, 0); + tt_int_op(0, OP_EQ, chmod(forbidden, 0)); #endif #define TEST(input) \ @@ -4639,10 +4639,10 @@ test_util_glob(void *ptr) done: #ifndef _WIN32 - chmod(forbidden, 0700); - chmod(dir1_forbidden, 0700); - chmod(dir2_forbidden, 0700); - chmod(forbidden_forbidden, 0700); + (void) chmod(forbidden, 0700); + (void) chmod(dir1_forbidden, 0700); + (void) chmod(dir2_forbidden, 0700); + (void) chmod(forbidden_forbidden, 0700); #endif tor_free(dir1); tor_free(dir2); @@ -4832,10 +4832,20 @@ test_util_get_glob_opened_files(void *ptr) done: #ifndef _WIN32 - chmod(forbidden, 0700); - chmod(dir1_forbidden, 0700); - chmod(dir2_forbidden, 0700); - chmod(forbidden_forbidden, 0700); + { + int chmod_failed = 0; + if (forbidden) + chmod_failed |= chmod(forbidden, 0700); + if (dir1_forbidden) + chmod_failed |= chmod(dir1_forbidden, 0700); + if (dir2_forbidden) + chmod_failed |= chmod(dir2_forbidden, 0700); + if (forbidden_forbidden) + chmod_failed |= chmod(forbidden_forbidden, 0700); + if (chmod_failed) { + TT_FAIL(("unable to chmod a file on cleanup: %s", strerror(errno))); + } + } #endif tor_free(dir1); tor_free(dir2); |