D27818.id81481.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27818.id81481.diff
View Options

	diff --git a/tests/sys/fs/fusefs/utils.cc b/tests/sys/fs/fusefs/utils.cc
	--- a/tests/sys/fs/fusefs/utils.cc
	+++ b/tests/sys/fs/fusefs/utils.cc
	@@ -376,10 +376,10 @@
	in.body.read.fh == FH &&
	in.body.read.offset == offset &&
	in.body.read.size == isize &&
	- flags == -1 ?
	+ (flags == -1 ?
	(in.body.read.flags == O_RDONLY \|\|
	in.body.read.flags == O_RDWR)
	- : in.body.read.flags == (uint32_t)flags);
	+ : in.body.read.flags == (uint32_t)flags));
	}, Eq(true)),
	_)
	).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
	diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc
	--- a/tests/sys/fs/fusefs/write.cc
	+++ b/tests/sys/fs/fusefs/write.cc
	@@ -508,7 +508,7 @@
	const char *INITIAL = "XXXXXXXXXX";
	uint64_t ino = 42;
	uint64_t offset = 1;
	- ssize_t bufsize = strlen(CONTENTS);
	+ ssize_t bufsize = strlen(CONTENTS) + 1;
	off_t orig_fsize = 10;
	off_t truncated_fsize = 5;
	off_t final_fsize = bufsize;
	@@ -517,8 +517,6 @@
	FuseTest::expect_lookup(RELPATH, ino, S_IFREG \| 0644, orig_fsize, 1);
	expect_open(ino, 0, 1);
	expect_read(ino, 0, orig_fsize, truncated_fsize, INITIAL, O_RDWR);
	- expect_getattr(ino, truncated_fsize);
	- expect_read(ino, 0, final_fsize, final_fsize, INITIAL, O_RDWR);
	maybe_expect_write(ino, offset, bufsize, CONTENTS);

	fd = open(FULLPATH, O_RDWR);