Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Unified Diff: media/midi/midi_unittests.isolate

Issue 1065743003: Reland: Web MIDI: split build rules for media/midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed patch set Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/midi/midi_scheduler.h ('k') | media/midi/usb_midi_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_unittests.isolate
diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/media/midi/midi_unittests.isolate
similarity index 71%
copy from ui/touch_selection/ui_touch_selection_unittests.isolate
copy to media/midi/midi_unittests.isolate
index 3218fa4e7f8692f5abee5448145d1e925468e574..dca0d3596d1961b0f64e48c9c962074abc0bd203 100644
--- a/ui/touch_selection/ui_touch_selection_unittests.isolate
+++ b/media/midi/midi_unittests.isolate
@@ -1,13 +1,16 @@
-# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Copyright 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.
{
+ 'includes': [
+ '../../base/base.isolate',
+ ],
'conditions': [
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
- '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/midi_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -21,7 +24,7 @@
'command': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/midi_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -30,7 +33,7 @@
],
'files': [
'../../testing/xvfb.py',
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/xdisplaycheck',
],
},
}],
@@ -38,26 +41,23 @@
'variables': {
'files': [
'../../testing/test_env.py',
- '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/midi_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
- ['OS=="linux"', {
+ ['OS=="mac" and asan==1 and fastbuild==0', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/libosmesa.so',
+ '<(PRODUCT_DIR)/midi_unittests.dSYM/',
],
},
}],
- ['OS=="mac" and asan==1 and fastbuild==0', {
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/ui_touch_selection_unittests.dSYM/',
+ '<(PRODUCT_DIR)/midi_unittests.exe.pdb',
],
},
}],
],
- 'includes': [
- '../../base/base.isolate',
- ],
}
« no previous file with comments | « media/midi/midi_scheduler.h ('k') | media/midi/usb_midi_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698