Skip to content

Commit

Permalink
fuchsia: Disable sqlite tests that require shm in vfs
Browse files Browse the repository at this point in the history
Dot-file locking (which we're currently using on Fuchsia) specifies
"version 1" of VFS. This doesn't include SHM functions, so disable the
mmap-requiring tests.

Bug: 764423
Change-Id: I2bb24f4130bebdb3371aca4ee4169dd573d9cbb1
Reviewed-on: https://chromium-review.googlesource.com/665301
Reviewed-by: Victor Costan <pwnall@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502096}
  • Loading branch information
sgraham authored and Commit Bot committed Sep 14, 2017
1 parent 49a84e9 commit 502836c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sql/sqlite_features_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h"
#include "base/files/scoped_temp_dir.h"
#include "build/build_config.h"
#include "sql/connection.h"
#include "sql/statement.h"
#include "sql/test/sql_test_base.h"
Expand Down Expand Up @@ -163,7 +164,7 @@ TEST_F(SQLiteFeaturesTest, ForeignKeySupport) {
EXPECT_EQ("", ExecuteWithResult(&db(), kSelectChildren));
}

#if defined(MOJO_APPTEST_IMPL) || defined(OS_IOS)
#if defined(MOJO_APPTEST_IMPL) || defined(OS_IOS) || defined(OS_FUCHSIA)
// If the platform cannot support SQLite mmap'ed I/O, make sure SQLite isn't
// offering to support it.
TEST_F(SQLiteFeaturesTest, NoMmap) {
Expand Down Expand Up @@ -191,7 +192,7 @@ TEST_F(SQLiteFeaturesTest, NoMmap) {
}
#endif

#if !defined(MOJO_APPTEST_IMPL)
#if !defined(MOJO_APPTEST_IMPL) && !defined(OS_FUCHSIA)
// Verify that OS file writes are reflected in the memory mapping of a
// memory-mapped file. Normally SQLite writes to memory-mapped files using
// memcpy(), which should stay consistent. Our SQLite is slightly patched to
Expand Down Expand Up @@ -457,7 +458,7 @@ TEST_F(SQLiteFeaturesTest, SmartAutoVacuum) {
}
#endif // !defined(USE_SYSTEM_SQLITE)

#if !defined(USE_SYSTEM_SQLITE)
#if !defined(USE_SYSTEM_SQLITE) && !defined(OS_FUCHSIA)
// SQLite WAL mode defaults to checkpointing the WAL on close. This would push
// additional work into Chromium shutdown. Verify that SQLite supports a config
// option to not checkpoint on close.
Expand Down
12 changes: 12 additions & 0 deletions testing/buildbot/chromium.fyi.json
Original file line number Diff line number Diff line change
Expand Up @@ -11346,6 +11346,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "sql_unittests"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
Expand Down Expand Up @@ -11449,6 +11455,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "sql_unittests"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
Expand Down

0 comments on commit 502836c

Please sign in to comment.