Add verity open benchmark test

PiperOrigin-RevId: 386533065

4 files changed, 27 insertions, 27 deletions

diff --git a/test/syscalls/linux/verity_getdents.cc b/test/syscalls/linux/verity_getdents.cc
index 2eafc3dd3..822a75254 100644
--- a/test/syscalls/linux/verity_getdents.cc
+++ b/test/syscalls/linux/verity_getdents.cc
@@ -59,7 +59,7 @@ class GetDentsTest : public ::testing::Test {
 
 TEST_F(GetDentsTest, GetDents) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   std::vector<std::string> expect = {".", "..", filename_};
   EXPECT_NO_ERRNO(DirContains(verity_dir, expect, /*exclude=*/{}));
@@ -67,7 +67,7 @@ TEST_F(GetDentsTest, GetDents) {
 
 TEST_F(GetDentsTest, Deleted) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   EXPECT_THAT(unlink(JoinPath(tmpfs_dir_.path(), filename_).c_str()),
               SyscallSucceeds());
@@ -78,7 +78,7 @@ TEST_F(GetDentsTest, Deleted) {
 
 TEST_F(GetDentsTest, Renamed) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   std::string new_file_name = "renamed-" + filename_;
   EXPECT_THAT(rename(JoinPath(tmpfs_dir_.path(), filename_).c_str(),
diff --git a/test/syscalls/linux/verity_ioctl.cc b/test/syscalls/linux/verity_ioctl.cc
index e7e4fa64b..45650809c 100644
--- a/test/syscalls/linux/verity_ioctl.cc
+++ b/test/syscalls/linux/verity_ioctl.cc
@@ -106,7 +106,7 @@ TEST_F(IoctlTest, Measure) {
 
 TEST_F(IoctlTest, Mount) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Make sure the file can be open and read in the mounted verity fs.
   auto const verity_fd = ASSERT_NO_ERRNO_AND_VALUE(
@@ -118,7 +118,7 @@ TEST_F(IoctlTest, Mount) {
 
 TEST_F(IoctlTest, NonExistingFile) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Confirm that opening a non-existing file in the verity-enabled directory
   // triggers the expected error instead of verification failure.
@@ -129,7 +129,7 @@ TEST_F(IoctlTest, NonExistingFile) {
 
 TEST_F(IoctlTest, ModifiedFile) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Modify the file and check verification failure upon reading from it.
   auto const fd = ASSERT_NO_ERRNO_AND_VALUE(
@@ -144,7 +144,7 @@ TEST_F(IoctlTest, ModifiedFile) {
 
 TEST_F(IoctlTest, ModifiedMerkle) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Modify the Merkle file and check verification failure upon opening the
   // corresponding file.
@@ -159,7 +159,7 @@ TEST_F(IoctlTest, ModifiedMerkle) {
 
 TEST_F(IoctlTest, ModifiedDirMerkle) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Modify the Merkle file for the parent directory and check verification
   // failure upon opening the corresponding file.
@@ -174,7 +174,7 @@ TEST_F(IoctlTest, ModifiedDirMerkle) {
 
 TEST_F(IoctlTest, Stat) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   struct stat st;
   EXPECT_THAT(stat(JoinPath(verity_dir, filename_).c_str(), &st),
@@ -183,7 +183,7 @@ TEST_F(IoctlTest, Stat) {
 
 TEST_F(IoctlTest, ModifiedStat) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   EXPECT_THAT(chmod(JoinPath(tmpfs_dir_.path(), filename_).c_str(), 0644),
               SyscallSucceeds());
@@ -194,7 +194,7 @@ TEST_F(IoctlTest, ModifiedStat) {
 
 TEST_F(IoctlTest, DeleteFile) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   EXPECT_THAT(unlink(JoinPath(tmpfs_dir_.path(), filename_).c_str()),
               SyscallSucceeds());
@@ -204,7 +204,7 @@ TEST_F(IoctlTest, DeleteFile) {
 
 TEST_F(IoctlTest, DeleteMerkle) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   EXPECT_THAT(
       unlink(MerklePath(JoinPath(tmpfs_dir_.path(), filename_)).c_str()),
@@ -215,7 +215,7 @@ TEST_F(IoctlTest, DeleteMerkle) {
 
 TEST_F(IoctlTest, RenameFile) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   std::string new_file_name = "renamed-" + filename_;
   EXPECT_THAT(rename(JoinPath(tmpfs_dir_.path(), filename_).c_str(),
@@ -227,7 +227,7 @@ TEST_F(IoctlTest, RenameFile) {
 
 TEST_F(IoctlTest, RenameMerkle) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   std::string new_file_name = "renamed-" + filename_;
   EXPECT_THAT(
diff --git a/test/syscalls/linux/verity_mmap.cc b/test/syscalls/linux/verity_mmap.cc
index 09ced6eb3..2bfd43b16 100644
--- a/test/syscalls/linux/verity_mmap.cc
+++ b/test/syscalls/linux/verity_mmap.cc
@@ -58,7 +58,7 @@ class MmapTest : public ::testing::Test {
 
 TEST_F(MmapTest, MmapRead) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Make sure the file can be open and mmapped in the mounted verity fs.
   auto const verity_fd = ASSERT_NO_ERRNO_AND_VALUE(
@@ -72,7 +72,7 @@ TEST_F(MmapTest, MmapRead) {
 
 TEST_F(MmapTest, ModifiedBeforeMmap) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Modify the file and check verification failure upon mmapping.
   auto const fd = ASSERT_NO_ERRNO_AND_VALUE(
@@ -91,7 +91,7 @@ TEST_F(MmapTest, ModifiedBeforeMmap) {
 
 TEST_F(MmapTest, ModifiedAfterMmap) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   auto const verity_fd = ASSERT_NO_ERRNO_AND_VALUE(
       Open(JoinPath(verity_dir, filename_), O_RDONLY, 0777));
@@ -127,7 +127,7 @@ INSTANTIATE_TEST_SUITE_P(
 
 TEST_P(MmapParamTest, Mmap) {
   std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_, /*targets=*/{}));
+      MountVerity(tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY)}));
 
   // Make sure the file can be open and mmapped in the mounted verity fs.
   auto const verity_fd = ASSERT_NO_ERRNO_AND_VALUE(
diff --git a/test/syscalls/linux/verity_symlink.cc b/test/syscalls/linux/verity_symlink.cc
index bbf5375cb..c6fce8ead 100644
--- a/test/syscalls/linux/verity_symlink.cc
+++ b/test/syscalls/linux/verity_symlink.cc
@@ -62,9 +62,9 @@ class SymlinkTest : public ::testing::Test {
 };
 
 TEST_F(SymlinkTest, Success) {
-  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_,
-                  {EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
+  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(MountVerity(
+      tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY),
+                          EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
 
   char buf[256];
   EXPECT_THAT(
@@ -77,9 +77,9 @@ TEST_F(SymlinkTest, Success) {
 }
 
 TEST_F(SymlinkTest, DeleteLink) {
-  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_,
-                  {EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
+  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(MountVerity(
+      tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY),
+                          EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
 
   ASSERT_THAT(unlink(JoinPath(tmpfs_dir_.path(), kSymlink).c_str()),
               SyscallSucceeds());
@@ -92,9 +92,9 @@ TEST_F(SymlinkTest, DeleteLink) {
 }
 
 TEST_F(SymlinkTest, ModifyLink) {
-  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(
-      MountVerity(tmpfs_dir_.path(), filename_,
-                  {EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
+  std::string verity_dir = ASSERT_NO_ERRNO_AND_VALUE(MountVerity(
+      tmpfs_dir_.path(), {EnableTarget(filename_, O_RDONLY),
+                          EnableTarget(kSymlink, O_RDONLY | O_NOFOLLOW)}));
 
   ASSERT_THAT(unlink(JoinPath(tmpfs_dir_.path(), kSymlink).c_str()),
               SyscallSucceeds());