summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorphosek <phosek@chromium.org>2015-12-17 08:35:42 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-17 16:36:29 +0000
commitca8571a9777c5207d61dc28c323779e767b99bad (patch)
treee8363cb8c850dfbfcdde4048a20a473f59fe9a5e /sandbox
parent270402789b8e60ccbeb19229e681ae9bb02aebf5 (diff)
downloadchromium_src-ca8571a9777c5207d61dc28c323779e767b99bad.zip
chromium_src-ca8571a9777c5207d61dc28c323779e767b99bad.tar.gz
chromium_src-ca8571a9777c5207d61dc28c323779e767b99bad.tar.bz2
GN: Build nacl_helper_nonsfi unit tests
The DoSocketpair function in nonsfi_sandbox_unittest.cc is unused which causes a build error due to -Wunused-function which is set by default in GN hence removing the function. BUG=564877 Review URL: https://codereview.chromium.org/1497543006 Cr-Commit-Position: refs/heads/master@{#365836}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/linux/BUILD.gn11
1 files changed, 8 insertions, 3 deletions
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index 5163425..8396a661 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -55,8 +55,6 @@ source_set("sandbox_linux_test_utils") {
"tests/sandbox_test_runner.h",
"tests/sandbox_test_runner_function_pointer.cc",
"tests/sandbox_test_runner_function_pointer.h",
- "tests/test_utils.cc",
- "tests/test_utils.h",
"tests/unit_tests.cc",
"tests/unit_tests.h",
]
@@ -65,7 +63,14 @@ source_set("sandbox_linux_test_utils") {
"//testing/gtest",
]
- if (use_seccomp_bpf) {
+ if (!is_nacl_nonsfi) {
+ sources += [
+ "tests/test_utils.cc",
+ "tests/test_utils.h",
+ ]
+ }
+
+ if (use_seccomp_bpf || is_nacl_nonsfi) {
sources += [
"seccomp-bpf/bpf_tester_compatibility_delegate.h",
"seccomp-bpf/bpf_tests.h",