Index: extensions/extensions_unittests.isolate |
diff --git a/cc/cc_unittests.isolate b/extensions/extensions_unittests.isolate |
similarity index 72% |
copy from cc/cc_unittests.isolate |
copy to extensions/extensions_unittests.isolate |
index 6a16fcd5e9c1df9ef88db14924e63bd665a2dcf8..d5181723566632665c8513c8fa354d20a1f743b0 100644 |
--- a/cc/cc_unittests.isolate |
+++ b/extensions/extensions_unittests.isolate |
@@ -7,7 +7,7 @@ |
'variables': { |
'command': [ |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/extensions_unittests<(EXECUTABLE_SUFFIX)', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -21,7 +21,7 @@ |
'command': [ |
'../testing/xvfb.py', |
'<(PRODUCT_DIR)', |
- '<(PRODUCT_DIR)/cc_unittests', |
+ '<(PRODUCT_DIR)/extensions_unittests<(EXECUTABLE_SUFFIX)', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -30,57 +30,50 @@ |
], |
'files': [ |
'../testing/xvfb.py', |
- '<(PRODUCT_DIR)/xdisplaycheck', |
M-A Ruel
2015/06/29 17:53:12
You need it. It's used by xvfb.py.
Reilly Grant (use Gerrit)
2015/06/29 18:47:42
I moved it up here but that didn't seem to resolve
|
], |
}, |
}], |
['OS=="linux" or OS=="mac" or OS=="win"', { |
'variables': { |
'files': [ |
- 'test/data/', |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/extensions_unittests<(EXECUTABLE_SUFFIX)', |
], |
+ 'read_only': 1, |
}, |
}], |
['OS=="linux"', { |
'variables': { |
'files': [ |
'<(PRODUCT_DIR)/libosmesa.so', |
+ '<(PRODUCT_DIR)/lib/libmalloc_wrapper.so', |
], |
}, |
}], |
- ['OS=="mac"', { |
+ ['OS=="linux" and use_ozone==0', { |
'variables': { |
'files': [ |
- '<(PRODUCT_DIR)/osmesa.so', |
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
], |
}, |
}], |
- ['OS=="win"', { |
+ ['OS=="mac" and asan==1 and fastbuild==0', { |
'variables': { |
'files': [ |
- '<(PRODUCT_DIR)/osmesa.dll', |
+ '<(PRODUCT_DIR)/extensions_unittests.dSYM/', |
], |
}, |
}], |
['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
'variables': { |
'files': [ |
- '<(PRODUCT_DIR)/cc_unittests.exe.pdb', |
- ], |
- }, |
- }], |
- ['OS=="mac" and asan==1 and fastbuild==0', { |
- 'variables': { |
- 'files': [ |
- '<(PRODUCT_DIR)/cc_unittests.dSYM/', |
+ '<(PRODUCT_DIR)/extensions_unittests.exe.pdb', |
], |
}, |
}], |
], |
'includes': [ |
'../base/base.isolate', |
- '../third_party/angle/angle.isolate', |
+ '../gin/v8.isolate', |
], |
} |