Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: remoting/webapp/BUILD.gn

Issue 1281953002: Fix QUnitBrowserTestRunner.Remoting_Webapp_Js_Unittest for GN browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/webapp/build-html.py » ('j') | remoting/webapp/build-html.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/BUILD.gn
diff --git a/remoting/webapp/BUILD.gn b/remoting/webapp/BUILD.gn
index f46d72218b544613ea859d29d79f76afaf2dbcec..78620a8d7c0566101b9edb6c6254e047d4ab904a 100644
--- a/remoting/webapp/BUILD.gn
+++ b/remoting/webapp/BUILD.gn
@@ -73,6 +73,7 @@ remoting_unit_test_out_dir = "$root_out_dir/remoting/unittests"
group("unit_tests") {
data_deps = [
":blanketjs",
+ ":build_unittest",
":js_files",
":qunit",
":sinonjs",
@@ -82,10 +83,7 @@ group("unit_tests") {
copy("js_files") {
# This list corresponds to webapp_js_files in remoting_webapp_unittests
# target in GYP.
- sources = remoting_webapp_unittest_html_all_js_files +
- remoting_webapp_wcs_sandbox_html_js_files +
- remoting_webapp_background_html_js_files +
- remoting_webapp_unittests_all_files
+ sources = webapp_js_files + remoting_webapp_unittests_all_files
outputs = [
"$remoting_unit_test_out_dir/{{source_file_part}}",
]
@@ -121,3 +119,17 @@ copy("qunit") {
"$remoting_unit_test_out_dir/qunit/{{source_file_part}}",
]
}
+
+action("build_unittest") {
+ script = "build-html.py"
+ outputs = [
+ "$remoting_unit_test_out_dir/unittests.html",
+ ]
+ args = rebase_path(outputs, root_build_dir) + [
+ rebase_path(remoting_webapp_unittests_template_main, root_build_dir),
+ "--exclude-js",
+ ] + rebase_path(remoting_webapp_unittests_exclude_js_files,
+ root_build_dir) + [ "--js" ] +
+ rebase_path(remoting_webapp_unittests_all_js_files, root_build_dir) +
+ [ "--instrument-js" ] + rebase_path(webapp_js_files, root_build_dir)
+}
« no previous file with comments | « no previous file | remoting/webapp/build-html.py » ('j') | remoting/webapp/build-html.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698