Commit 15d905de authored by Victor Costan's avatar Victor Costan Committed by Chromium LUCI CQ

sql: Run SQLDatabaseTestExclusiveMode tests.

Currently, the SQLDatabaseTestExclusiveMode suite is not instantiated,
so the tests are not run. This CL instantiates the suite.

This problem was discovered by attempting to roll googletest past CL
315255779, which causes test binaries to fail when they include test
suites / parametrized tests that are not instantiated, and when they
include empty test suites.

Bug: 1163396
Change-Id: Ieb47f8d612c48af04f3d9d05e1873fc437c2f6c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2615579
Commit-Queue: Victor Costan <pwnall@chromium.org>
Commit-Queue: Darwin Huang <huangdarwin@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Reviewed-by: default avatarDarwin Huang <huangdarwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841220}
parent d389cfeb
......@@ -853,13 +853,6 @@ TEST_P(SQLDatabaseTest, Delete) {
EXPECT_FALSE(GetPathExists(wal_path));
}
// WAL mode is currently not supported on Fuchsia
#if !defined(OS_FUCHSIA)
INSTANTIATE_TEST_SUITE_P(JournalMode, SQLDatabaseTest, testing::Bool());
#else
INSTANTIATE_TEST_SUITE_P(JournalMode, SQLDatabaseTest, testing::Values(false));
#endif
#if defined(OS_POSIX) // This test operates on POSIX file permissions.
TEST_P(SQLDatabaseTest, PosixFilePermissions) {
db().Close();
......@@ -1375,4 +1368,17 @@ TEST_P(SQLDatabaseTest, CompileError) {
#endif // !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_FUCHSIA)
}
// WAL mode is currently not supported on Fuchsia.
#if !defined(OS_FUCHSIA)
INSTANTIATE_TEST_SUITE_P(JournalMode, SQLDatabaseTest, testing::Bool());
INSTANTIATE_TEST_SUITE_P(JournalMode,
SQLDatabaseTestExclusiveMode,
testing::Bool());
#else
INSTANTIATE_TEST_SUITE_P(JournalMode, SQLDatabaseTest, testing::Values(false));
INSTANTIATE_TEST_SUITE_P(JournalMode,
SQLDatabaseTestExclusiveMode,
testing::Values(false));
#endif
} // namespace sql
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment