diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | chrome/test/data/nacl/nacl_test_data.gyp | 11 | ||||
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi (renamed from chrome/test/data/nacl/nacl_browser_test.gypi) | 10 |
3 files changed, 21 insertions, 6 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9429383..1e7c7f0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1777,6 +1777,12 @@ 'chrome.gyp:chrome_nacl_win64', ], }], + ['OS=="linux"', { + 'dependencies': [ + '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap', + 'nacl_helper', + ], + }], ['chromeos==0', { 'sources!': [ 'test/data/chromeos/oobe_webui_browsertest.js', diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp index 52c37d8..c9512e3 100644 --- a/chrome/test/data/nacl/nacl_test_data.gyp +++ b/chrome/test/data/nacl/nacl_test_data.gyp @@ -4,7 +4,7 @@ { 'includes': [ - 'nacl_browser_test.gypi', + '../../../../ppapi/ppapi_nacl_test_common.gypi', ], 'targets': [ { @@ -14,6 +14,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'test_files': [ # TODO(ncbray) move into chrome/test/data/nacl when all tests are # converted. @@ -31,6 +32,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'sources': [ 'simple.cc', ], @@ -47,6 +49,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'sources': [ 'exit_status/pm_exit_status_test.cc', ], @@ -64,6 +67,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'sources': [ # TODO(ncbray) move these files once SCons no longer depends on them. '../../../../ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc', @@ -85,6 +89,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'link_flags': [ '-lppapi', '-lppapi_test_lib', @@ -113,6 +118,7 @@ 'variables': { 'nexe_target': 'pnacl_error_handling', 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'sources': [ 'pnacl_error_handling/program_fragment.cc', ], @@ -158,6 +164,7 @@ 'variables': { 'nexe_target': 'pnacl_options', 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', # No need to translate these AOT, when we just need the pexe. 'enable_x86_32': 0, 'enable_x86_64': 0, @@ -189,6 +196,7 @@ 'enable_arm': 0, 'nexe_target': 'pnacl_dyncode_syscall_disabled', 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'link_flags': [ '-lppapi', '-lppapi_test_lib', @@ -222,6 +230,7 @@ 'build_newlib': 1, 'build_glibc': 1, 'build_pnacl_newlib': 1, + 'nexe_destination_dir': 'nacl_test_data', 'link_flags': [ '-lppapi', '-lppapi_test_lib', diff --git a/chrome/test/data/nacl/nacl_browser_test.gypi b/ppapi/ppapi_nacl_test_common.gypi index fb95f7b..2d7173d 100644 --- a/chrome/test/data/nacl/nacl_browser_test.gypi +++ b/ppapi/ppapi_nacl_test_common.gypi @@ -1,10 +1,10 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright (c) 2013 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': [ - '../../../../native_client/build/untrusted.gypi', + '../native_client/build/untrusted.gypi', ], 'target_defaults': { # We need to override the variables in untrusted.gypi outside of a @@ -16,9 +16,9 @@ 'variables': { 'test_files': [], 'generate_nmf%': 1, - 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib', - 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc', - 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/pnacl', + 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib', + 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc', + 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl', 'target_conditions': [ ['nexe_target!=""', { # These variables are used for nexe building and for library building. |