am d4144fd7: am b023799a: Merge "Fix ftw tests when run as non-root."

* commit 'd4144fd700974911fc28e69174ec526d081ea902':
  Fix ftw tests when run as non-root.
This commit is contained in:
Elliott Hughes 2015-04-01 22:09:30 +00:00 committed by Android Git Automerger
commit 08c16b17a1

View File

@ -30,11 +30,11 @@ static void MakeTree(const char* root) {
char path[PATH_MAX];
snprintf(path, sizeof(path), "%s/dir", root);
ASSERT_EQ(0, mkdir(path, 0555));
ASSERT_EQ(0, mkdir(path, 0755)) << path;
snprintf(path, sizeof(path), "%s/dir/sub", root);
ASSERT_EQ(0, mkdir(path, 0555));
ASSERT_EQ(0, mkdir(path, 0555)) << path;
snprintf(path, sizeof(path), "%s/unreadable-dir", root);
ASSERT_EQ(0, mkdir(path, 0000));
ASSERT_EQ(0, mkdir(path, 0000)) << path;
snprintf(path, sizeof(path), "%s/dangler", root);
ASSERT_EQ(0, symlink("/does-not-exist", path));