Index: cc/cc_unittests.isolate |
diff --git a/media/media_unittests.isolate b/cc/cc_unittests.isolate |
similarity index 78% |
copy from media/media_unittests.isolate |
copy to cc/cc_unittests.isolate |
index cea8c33f800c756d18a1f542f17af717eed8a092..4e5ac92c966e1ec04dba0b49ae27fb0de3d654f8 100644 |
--- a/media/media_unittests.isolate |
+++ b/cc/cc_unittests.isolate |
@@ -1,23 +1,14 @@ |
-# Copyright 2013 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': [ |
- ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
- 'variables': { |
- 'files': [ |
- 'test/data/', |
- ], |
- }, |
- }], |
['OS=="linux" or OS=="mac" or OS=="win"', { |
'variables': { |
'files': [ |
+ 'test/data/', |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', |
], |
}, |
}], |
@@ -26,7 +17,7 @@ |
'command': [ |
'../testing/xvfb.py', |
'<(PRODUCT_DIR)', |
- '<(PRODUCT_DIR)/media_unittests', |
+ '<(PRODUCT_DIR)/cc_unittests', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -35,6 +26,13 @@ |
'files': [ |
'../testing/xvfb.py', |
'<(PRODUCT_DIR)/libffmpegsumo.so', |
+ '<(PRODUCT_DIR)/libosmesa.so', |
+ ], |
+ }, |
+ }], |
+ ['OS=="linux" and use_ozone==0', { |
+ 'variables': { |
+ 'files': [ |
'<(PRODUCT_DIR)/xdisplaycheck', |
], |
}, |
@@ -43,7 +41,7 @@ |
'variables': { |
'command': [ |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/media_unittests', |
+ '<(PRODUCT_DIR)/cc_unittests', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -51,6 +49,7 @@ |
], |
'files': [ |
'<(PRODUCT_DIR)/ffmpegsumo.so', |
+ '<(PRODUCT_DIR)/osmesa.so', |
], |
}, |
}], |
@@ -58,7 +57,7 @@ |
'variables': { |
'command': [ |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/media_unittests.exe', |
+ '<(PRODUCT_DIR)/cc_unittests.exe', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -66,15 +65,19 @@ |
], |
'files': [ |
'<(PRODUCT_DIR)/ffmpegsumo.dll', |
+ '<(PRODUCT_DIR)/osmesa.dll', |
], |
}, |
}], |
['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
'variables': { |
'files': [ |
- '<(PRODUCT_DIR)/media_unittests.exe.pdb', |
+ '<(PRODUCT_DIR)/cc_unittests.exe.pdb', |
], |
}, |
}], |
], |
+ 'includes': [ |
+ '../base/base.isolate', |
+ ], |
} |