Index: ash/ash_unittests.isolate |
diff --git a/base/base_unittests.isolate b/ash/ash_unittests.isolate |
similarity index 57% |
copy from base/base_unittests.isolate |
copy to ash/ash_unittests.isolate |
index a7a0723790718be93706a6ce9f1fedba94afe898..deffc83a96db32cfcbf4730e06c6f9f1c16526ff 100644 |
--- a/base/base_unittests.isolate |
+++ b/ash/ash_unittests.isolate |
@@ -1,12 +1,17 @@ |
-# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+# Copyright (c) 2014 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=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
+ ['OS=="win" or OS=="linux"', { |
'variables': { |
- 'isolate_dependency_untracked': [ |
- 'test/data/', |
+ 'isolate_dependency_tracked': [ |
+ '../testing/test_env.py', |
+ '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/chrome_100_percent.pak', |
+ '<(PRODUCT_DIR)/chrome_200_percent.pak', |
dmichael(do not use this one)
2014/09/29 17:02:28
I'm having errors locally this morning when ninja
|
+ '<(PRODUCT_DIR)/locales/en-US.pak', |
+ '<(PRODUCT_DIR)/keyboard_resources.pak', |
], |
}, |
}], |
@@ -15,12 +20,13 @@ |
'command': [ |
'../testing/xvfb.py', |
'<(PRODUCT_DIR)', |
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
- '--brave-new-test-launcher', |
+ '<(PRODUCT_DIR)/ash_unittests', |
'--test-launcher-bot-mode', |
], |
'isolate_dependency_tracked': [ |
'../testing/xvfb.py', |
+ '<(PRODUCT_DIR)/libffmpegsumo.so', |
+ '<(PRODUCT_DIR)/libosmesa.so', |
], |
}, |
}], |
@@ -31,34 +37,28 @@ |
], |
}, |
}], |
- ['OS=="linux" or OS=="mac" or OS=="win"', { |
- 'variables': { |
- 'isolate_dependency_tracked': [ |
- '../testing/test_env.py', |
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
- ], |
- 'read_only': 1, |
- }, |
- }], |
- ['OS=="mac" or OS=="win"', { |
+ ['OS=="win"', { |
'variables': { |
'command': [ |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
- '--brave-new-test-launcher', |
+ '<(PRODUCT_DIR)/ash_unittests.exe', |
'--test-launcher-bot-mode', |
], |
+ 'isolate_dependency_tracked': [ |
+ '<(PRODUCT_DIR)/ffmpegsumo.dll', |
+ '<(PRODUCT_DIR)/osmesa.dll', |
+ ], |
}, |
}], |
['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
'variables': { |
'isolate_dependency_untracked': [ |
- '<(PRODUCT_DIR)/base_unittests.exe.pdb', |
+ '<(PRODUCT_DIR)/ash_unittests.exe.pdb', |
], |
}, |
}], |
], |
'includes': [ |
- 'base.isolate', |
+ '../base/base.isolate', |
], |
} |