summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-03-30 16:02:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-30 23:03:21 +0000
commit47830e34472bcd8d5bceb4462a168436a7fcbb0a (patch)
treee8e3e3e52ea4f46f32c1465038f374cb60c5a608
parent38ede236cc3ecdf28050e53ac1500eb8794db9be (diff)
downloadchromium_src-47830e34472bcd8d5bceb4462a168436a7fcbb0a.zip
chromium_src-47830e34472bcd8d5bceb4462a168436a7fcbb0a.tar.gz
chromium_src-47830e34472bcd8d5bceb4462a168436a7fcbb0a.tar.bz2
Add nacl_loader_unittests target to linux_default_tests group.
After the previous round of fixes for 'gn check' errors, nacl_loader_unittests now links and runs. Tested on Linux with the following command lines: $ gn gen out-gn --args='enable_nacl=true' $ ninja -C out-gn nacl_loader_unittests $ out-gn/nacl_loader_unittests ... SUCCESS: all tests passed. Tests took 1 seconds. BUG=461019,432959 TEST=see above R=dpranke@chromium.org, TBR=bradnelson@chromium.org CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1044643003 Cr-Commit-Position: refs/heads/master@{#322897}
-rw-r--r--BUILD.gn5
-rw-r--r--components/nacl/BUILD.gn3
2 files changed, 7 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 0d130fe..a800bf9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -602,7 +602,6 @@ if (is_linux) {
testonly = true
deps = [
# components_browsertests TODO(GYP)
- # nacl_loader_unittests TODO(GYP)
"//base:base_unittests", # PASSES (*) 2/25/2015
"//cc:cc_unittests", # PASSES 2/25/2015
@@ -658,5 +657,9 @@ if (is_linux) {
# Note:
# (*) Fails but failures match GYP build at time of testing.
]
+
+ if (enable_nacl) {
+ deps += [ "//components/nacl:nacl_loader_unittests" ] # PASSES 3/28/2015
+ }
}
}
diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn
index f1d518e..8e9cd9b 100644
--- a/components/nacl/BUILD.gn
+++ b/components/nacl/BUILD.gn
@@ -154,12 +154,15 @@ if (enable_nacl) {
test("nacl_loader_unittests") {
sources = [
+ "loader/nacl_ipc_adapter_unittest.cc",
+ "loader/nacl_validation_query_unittest.cc",
"loader/run_all_unittests.cc",
]
deps = [
":nacl",
"//base/test:test_support",
+ "//ipc:test_support",
"//testing/gtest",
]
}