diff options
| author | bruening <bruening@chromium.org> | 2015-07-06 14:08:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-06 21:08:49 +0000 |
| commit | 88f5fa1663ae01c1474f6efa733f222ae494e867 (patch) | |
| tree | db5dbdecb50fde8fe48679dfe4af7152a33d223b /ipc/mojo | |
| parent | e81fbc84515f259a2024033d628e8628c8f14dde (diff) | |
| download | chromium_src-88f5fa1663ae01c1474f6efa733f222ae494e867.zip chromium_src-88f5fa1663ae01c1474f6efa733f222ae494e867.tar.gz chromium_src-88f5fa1663ae01c1474f6efa733f222ae494e867.tar.bz2 | |
Revert of Convert ipc_mojo_unittests to run exclusively on Swarming (patchset #1 id:1 of https://codereview.chromium.org/1222243003/)
Reason for revert:
Results in data races on ThreadSanitizer MFYI bot: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20TSan%20Tests/builds/6970
Original issue's description:
> Convert ipc_mojo_unittests to run exclusively on Swarming
>
> 0 configs already ran on Swarming
> 8 used to run locally and were converted:
> - chromium.linux.json: Android GN
> - chromium.linux.json: Linux Tests
> - chromium.linux.json: Linux Tests (dbg)(1)
> - chromium.linux.json: Linux Tests (dbg)(1)(32)
> - chromium.memory.fyi.json: Linux ChromeOS MSan Tests
> - chromium.memory.fyi.json: Linux MSan Tests
> - chromium.memory.fyi.json: Linux TSan Tests
> - chromium.win.json: XP Tests (1)
>
> Ran:
> ./manage.py --convert ipc_mojo_unittests
>
> BUG=98637
>
> Committed: https://crrev.com/15593557f4f387d91dc7726511a20cb999c81561
> Cr-Commit-Position: refs/heads/master@{#337431}
TBR=viettrungluu@chromium.org,maruel@chromium.org,thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=98637
Review URL: https://codereview.chromium.org/1218743008
Cr-Commit-Position: refs/heads/master@{#337473}
Diffstat (limited to 'ipc/mojo')
| -rw-r--r-- | ipc/mojo/ipc_mojo.gyp | 15 | ||||
| -rw-r--r-- | ipc/mojo/ipc_mojo_unittests.isolate | 20 |
2 files changed, 0 insertions, 35 deletions
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp index 40ce344..313ecb2 100644 --- a/ipc/mojo/ipc_mojo.gyp +++ b/ipc/mojo/ipc_mojo.gyp @@ -106,19 +106,4 @@ ], }, ], - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'ipc_mojo_unittests_run', - 'type': 'none', - 'dependencies': [ - 'ipc_mojo_unittests', - ], - 'includes': [ '../../build/isolate.gypi' ], - 'sources': [ 'ipc_mojo_unittests.isolate' ], - }, - ], - }], - ], } diff --git a/ipc/mojo/ipc_mojo_unittests.isolate b/ipc/mojo/ipc_mojo_unittests.isolate deleted file mode 100644 index 390958a..0000000 --- a/ipc/mojo/ipc_mojo_unittests.isolate +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], - 'includes': [ - '../../base/base.isolate', - ], -} |