summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 15:51:11 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 15:51:11 +0000
commit81155567d0455f48ca463de2857d4b4bb9f95b7b (patch)
tree3c1eef351da3c486a67ae7beb55768e9c31fe8d6
parent53a1dabd0e6fced8d587ec0486dc77777b47d6d6 (diff)
downloadchromium_src-81155567d0455f48ca463de2857d4b4bb9f95b7b.zip
chromium_src-81155567d0455f48ca463de2857d4b4bb9f95b7b.tar.gz
chromium_src-81155567d0455f48ca463de2857d4b4bb9f95b7b.tar.bz2
Add DumpRenderTree dependency to browser_tests_run.
It must be built for browser_tests to pass. TBR=csharp@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/11348204 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169341 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser_tests.isolate1
-rw-r--r--chrome/chrome_tests.gypi1
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index ab0fe6df3..47dc7ac 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -213,7 +213,6 @@
'<(PRODUCT_DIR)/libppapi_tests.so',
'<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'test/data/autofill/dataset_2.txt',
'test/data/autofill/dataset_no_address.txt',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ca44f8f..e41138f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2761,6 +2761,7 @@
'type': 'none',
'dependencies': [
'browser_tests',
+ '../webkit/webkit.gyp:pull_in_DumpRenderTree',
],
'includes': [
'../build/isolate.gypi',