Page MenuHomeFreeBSD
Files F142999086

D26635.diff
No OneTemporary
Actions

D26635.diff
View Options

Index: head/tests/sys/fs/fusefs/allow_other.cc
===================================================================
--- head/tests/sys/fs/fusefs/allow_other.cc
+++ head/tests/sys/fs/fusefs/allow_other.cc
@@ -168,7 +168,7 @@
.WillRepeatedly(Invoke(ReturnErrno(EPERM)));
fd1 = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd1) << strerror(errno);
+ ASSERT_LE(0, fd1) << strerror(errno);
}, [] {
int fd0;
Index: head/tests/sys/fs/fusefs/create.cc
===================================================================
--- head/tests/sys/fs/fusefs/create.cc
+++ head/tests/sys/fs/fusefs/create.cc
@@ -143,7 +143,7 @@
).Times(0);
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -184,7 +184,7 @@
EXPECT_EQ(0, stat("mountpoint", &sb)) << strerror(errno);
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
EXPECT_EQ(0, stat("mountpoint", &sb)) << strerror(errno);
leak(fd);
@@ -254,7 +254,7 @@
})));
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -366,7 +366,7 @@
}));
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -398,7 +398,7 @@
}));
fd = open(FULLPATH, O_CREAT | O_WRONLY, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -422,7 +422,7 @@
}));
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -446,6 +446,6 @@
}));
fd = open(FULLPATH, O_CREAT | O_EXCL, mode);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
Index: head/tests/sys/fs/fusefs/default_permissions.cc
===================================================================
--- head/tests/sys/fs/fusefs/default_permissions.cc
+++ head/tests/sys/fs/fusefs/default_permissions.cc
@@ -490,7 +490,7 @@
expect_create(RELPATH, ino);
fd = open(FULLPATH, O_CREAT | O_EXCL, 0644);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
@@ -765,7 +765,7 @@
expect_open(ino, 0, 1);
fd = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
Index: head/tests/sys/fs/fusefs/flush.cc
===================================================================
--- head/tests/sys/fs/fusefs/flush.cc
+++ head/tests/sys/fs/fusefs/flush.cc
@@ -102,10 +102,10 @@
expect_release();
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
fd2 = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd2) << strerror(errno);
+ ASSERT_LE(0, fd2) << strerror(errno);
EXPECT_EQ(0, close(fd2)) << strerror(errno);
EXPECT_EQ(0, close(fd)) << strerror(errno);
@@ -132,7 +132,7 @@
expect_release();
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_TRUE(0 == close(fd) || errno == EIO) << strerror(errno);
}
@@ -186,7 +186,7 @@
expect_release();
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_TRUE(0 == close(fd)) << strerror(errno);
}
Index: head/tests/sys/fs/fusefs/open.cc
===================================================================
--- head/tests/sys/fs/fusefs/open.cc
+++ head/tests/sys/fs/fusefs/open.cc
@@ -67,7 +67,7 @@
})));
fd = open(FULLPATH, os_flags);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
};
@@ -201,7 +201,7 @@
expect_release(ino, fh1);
fd1 = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd1) << strerror(errno);
+ ASSERT_LE(0, fd1) << strerror(errno);
}, [] {
int fd0;
Index: head/tests/sys/fs/fusefs/opendir.cc
===================================================================
--- head/tests/sys/fs/fusefs/opendir.cc
+++ head/tests/sys/fs/fusefs/opendir.cc
@@ -132,7 +132,7 @@
}));
fd = open(FULLPATH, O_DIRECTORY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
leak(fd);
}
Index: head/tests/sys/fs/fusefs/release.cc
===================================================================
--- head/tests/sys/fs/fusefs/release.cc
+++ head/tests/sys/fs/fusefs/release.cc
@@ -87,7 +87,7 @@
expect_release(ino, getpid(), O_RDONLY, 0);
fd = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
fd2 = dup(fd);
ASSERT_LE(0, fd2) << strerror(errno);
@@ -117,7 +117,7 @@
expect_release(ino, getpid(), O_WRONLY, EIO);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_TRUE(0 == close(fd) || errno == EIO) << strerror(errno);
}
@@ -139,7 +139,7 @@
expect_release(ino, getpid(), O_RDWR | O_APPEND, 0);
fd = open(FULLPATH, O_RDWR | O_APPEND);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(0, close(fd)) << strerror(errno);
}
@@ -162,11 +162,11 @@
expect_release(ino, getpid(), O_RDONLY, 0);
fd = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
expect_release(ino, getpid(), O_WRONLY, 0);
fd2 = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd2) << strerror(errno);
+ ASSERT_LE(0, fd2) << strerror(errno);
ASSERT_EQ(0, close(fd2)) << strerror(errno);
ASSERT_EQ(0, close(fd)) << strerror(errno);
@@ -185,7 +185,7 @@
expect_release(ino, getpid(), O_RDONLY, 0);
fd = open(FULLPATH, O_RDONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(0, close(fd)) << strerror(errno);
}
Index: head/tests/sys/fs/fusefs/releasedir.cc
===================================================================
--- head/tests/sys/fs/fusefs/releasedir.cc
+++ head/tests/sys/fs/fusefs/releasedir.cc
@@ -112,7 +112,7 @@
expect_releasedir(ino, ReturnErrno(0));
fd = open(FULLPATH, O_EXEC | O_DIRECTORY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(0, close(fd)) << strerror(errno);
}
Index: head/tests/sys/fs/fusefs/write.cc
===================================================================
--- head/tests/sys/fs/fusefs/write.cc
+++ head/tests/sys/fs/fusefs/write.cc
@@ -216,7 +216,7 @@
expect_write(ino, offset, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
iocb.aio_nbytes = bufsize;
iocb.aio_fildes = fd;
@@ -258,7 +258,7 @@
/* Must open O_RDWR or fuse(4) implicitly sets direct_io */
fd = open(FULLPATH, O_RDWR | O_APPEND);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(BUFSIZE, write(fd, CONTENTS, BUFSIZE)) << strerror(errno);
leak(fd);
@@ -291,7 +291,7 @@
/* Must open O_RDWR or fuse(4) implicitly sets direct_io */
fd = open(FULLPATH, O_RDWR | O_APPEND);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
/* Read the old data into the cache */
ASSERT_EQ((ssize_t)oldsize, read(fd, oldbuf, oldsize))
@@ -319,7 +319,7 @@
expect_write(ino, initial_offset, BUFSIZE, BUFSIZE, CONTENTS);
fd = open(FULLPATH, O_WRONLY | O_APPEND);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(BUFSIZE, write(fd, CONTENTS, BUFSIZE)) << strerror(errno);
leak(fd);
@@ -343,7 +343,7 @@
expect_write(ino, 0, bufsize, bufsize, CONTENTS1);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
// Prime cache
ASSERT_EQ(bufsize, read(fd, readbuf, bufsize)) << strerror(errno);
@@ -387,7 +387,7 @@
expect_write(ino, bufsize0, bufsize1, bufsize1, contents1);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
leak(fd);
@@ -412,7 +412,7 @@
expect_write(ino, 0, bufsize, halfbufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(halfbufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
leak(fd);
@@ -442,7 +442,7 @@
expect_write(ino, 0, totalsize, size0, EXPECTED0);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
iov[0].iov_base = __DECONST(void*, CONTENTS0);
iov[0].iov_len = strlen(CONTENTS0);
@@ -474,7 +474,7 @@
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(-1, pwrite(fd, CONTENTS, bufsize, offset));
EXPECT_EQ(EFBIG, errno);
@@ -508,7 +508,7 @@
maybe_expect_write(ino, offset, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, pwrite(fd, CONTENTS, bufsize, offset))
<< strerror(errno);
@@ -553,7 +553,7 @@
expect_release(ino, ReturnErrno(0));
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
ASSERT_NE(MAP_FAILED, p) << strerror(errno);
@@ -584,7 +584,7 @@
expect_write(ino, offset, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, pwrite(fd, CONTENTS, bufsize, offset))
<< strerror(errno);
@@ -607,7 +607,7 @@
maybe_expect_write(ino, 0, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(0, fstat(fd, &sb0)) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
@@ -636,7 +636,7 @@
expect_write(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
leak(fd);
@@ -667,7 +667,7 @@
&contents[halfbufsize / sizeof(int)]);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, contents, bufsize)) << strerror(errno);
leak(fd);
@@ -688,7 +688,7 @@
expect_open(ino, 0, 1);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
leak(fd);
@@ -708,7 +708,7 @@
expect_write_7_8(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
leak(fd);
@@ -854,7 +854,7 @@
maybe_expect_write(ino, offset, bufsize, CONTENTS);
fd = open(FULLPATH, O_WRONLY);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, pwrite(fd, CONTENTS, bufsize, offset))
<< strerror(errno);
@@ -879,7 +879,7 @@
expect_write(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
/*
@@ -913,7 +913,7 @@
expect_read(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR | O_DIRECT);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
/* A subsequent read must query the daemon because cache is empty */
@@ -940,7 +940,7 @@
expect_read(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
/* A subsequent read must query the daemon because cache is empty */
@@ -980,7 +980,7 @@
expect_release(ino, ReturnErrno(0));
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
ASSERT_NE(MAP_FAILED, p) << strerror(errno);
@@ -1016,7 +1016,7 @@
).Times(0);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
@@ -1051,7 +1051,7 @@
CONTENTS1);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
// Cache first block with dirty data. This will entail first reading
// the existing data.
@@ -1105,7 +1105,7 @@
expect_open(ino, 0, 1);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
/* Cache first and third blocks with dirty data. */
ASSERT_EQ(3 * bs, pwrite(fd, zeros, 3 * bs, 0)) << strerror(errno);
@@ -1178,7 +1178,7 @@
expect_read(ino, 0, m_maxbcachebuf, old_filesize, CONTENTS0);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
/* Write and cache data beyond EOF */
ASSERT_EQ(wbufsize, pwrite(fd, CONTENTS1, wbufsize, offset))
@@ -1248,7 +1248,7 @@
})));
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
ASSERT_EQ(0, fstat(fd, &sb)) << strerror(errno);
@@ -1287,7 +1287,7 @@
})));
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
ASSERT_EQ(0, fchmod(fd, newmode)) << strerror(errno);
@@ -1324,7 +1324,7 @@
})));
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
ASSERT_EQ(0, fchmod(fd, newmode)) << strerror(errno);
@@ -1351,7 +1351,7 @@
expect_write(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
/*
@@ -1379,7 +1379,7 @@
expect_write(ino, 0, bufsize, bufsize, CONTENTS);
fd = open(FULLPATH, O_RDWR);
- EXPECT_LE(0, fd) << strerror(errno);
+ ASSERT_LE(0, fd) << strerror(errno);
ASSERT_EQ(bufsize, write(fd, CONTENTS, bufsize)) << strerror(errno);
/* Get cached attributes */

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 26, 4:33 AM (22 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28000671
Default Alt Text
D26635.diff (14 KB)

Event Timeline