OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
8 | 8 |
9 # Convenience meta-target for all of Blimp's production & test code. | 9 # Convenience meta-target for all of Blimp's production & test code. |
10 group("blimp") { | 10 group("blimp") { |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 | 72 |
73 if (is_linux) { | 73 if (is_linux) { |
74 deps += [ "//blimp/engine:unit_tests" ] | 74 deps += [ "//blimp/engine:unit_tests" ] |
75 } | 75 } |
76 } | 76 } |
77 | 77 |
78 if (is_linux) { | 78 if (is_linux) { |
79 test("blimp_browsertests") { | 79 test("blimp_browsertests") { |
80 deps = [ | 80 deps = [ |
81 "//blimp/engine:browser_tests", | 81 "//blimp/engine:browser_tests", |
| 82 "//tools/xdisplaycheck", |
| 83 ] |
| 84 data = [ |
| 85 "test/data/", |
82 ] | 86 ] |
83 } | 87 } |
84 | 88 |
85 _blimp_engine_env_tests_runtime_deps = | 89 _blimp_engine_env_tests_runtime_deps = |
86 "$root_gen_dir/blimp-tests.runtime_deps" | 90 "$root_gen_dir/blimp-tests.runtime_deps" |
87 _rebased_blimp_engine_env_tests_runtime_deps = | 91 _rebased_blimp_engine_env_tests_runtime_deps = |
88 rebase_path(_blimp_engine_env_tests_runtime_deps, root_out_dir) | 92 rebase_path(_blimp_engine_env_tests_runtime_deps, root_out_dir) |
89 | 93 |
90 # This group contains Blimp Engine tests and tests of the various components | 94 # This group contains Blimp Engine tests and tests of the various components |
91 # the Blimp Engine depends on. The idea is that if this group of tests pass | 95 # the Blimp Engine depends on. The idea is that if this group of tests pass |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 "--output", | 209 "--output", |
206 rebase_path(_output_path, root_build_dir), | 210 rebase_path(_output_path, root_build_dir), |
207 "--target", | 211 "--target", |
208 rebase_path(_wrapped_script, root_build_dir), | 212 rebase_path(_wrapped_script, root_build_dir), |
209 "--output-directory", | 213 "--output-directory", |
210 rebase_path(root_out_dir, root_build_dir), | 214 rebase_path(root_out_dir, root_build_dir), |
211 "--flag-name=--output-linux-directory", | 215 "--flag-name=--output-linux-directory", |
212 ] | 216 ] |
213 } | 217 } |
214 } | 218 } |
OLD | NEW |