| OLD | NEW | 
|   1 # Copyright 2014 The Chromium Authors. All rights reserved. |   1 # Copyright 2014 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("//mojo/public/tools/bindings/mojom.gni") |   5 import("//mojo/public/tools/bindings/mojom.gni") | 
|   6 import("//testing/test.gni") |   6 import("//testing/test.gni") | 
|   7  |   7  | 
|   8 # TODO(hansmuller): The organization of tests in this directory is weird: |   8 # TODO(hansmuller): The organization of tests in this directory is weird: | 
|   9 #   * Really, js_unittests tests public stuff, so that should live in public |   9 #   * Really, js_unittests tests public stuff, so that should live in public | 
|  10 #     and be reworked as some sort of apptest. |  10 #     and be reworked as some sort of apptest. | 
|  11 #   * Both js_unittests and js_integration_tests should auto-generate their |  11 #   * Both js_unittests and js_integration_tests should auto-generate their | 
|  12 #     tests somehow. The .cc files are just test runner stubs, including |  12 #     tests somehow. The .cc files are just test runner stubs, including | 
|  13 #     explicit lists of .js files. |  13 #     explicit lists of .js files. | 
|  14  |  14  | 
|  15 group("tests") { |  15 group("tests") { | 
|  16   testonly = true |  16   testonly = true | 
|  17   deps = [ |  17   deps = [ | 
|  18     ":mojo_js_integration_tests", |  18     ":mojo_js_integration_tests", | 
|  19     ":mojo_js_unittests", |  19     ":mojo_js_unittests", | 
|  20   ] |  20   ] | 
|  21 } |  21 } | 
|  22  |  22  | 
|  23 test("mojo_js_integration_tests") { |  23 test("mojo_js_integration_tests") { | 
|  24   deps = [ |  24   deps = [ | 
|  25     ":js_to_cpp_bindings", |  25     ":js_to_cpp_bindings", | 
|  26     "//base/test:test_support", |  | 
|  27     "//gin:gin_test", |  26     "//gin:gin_test", | 
|  28     "//mojo/common", |  27     "//mojo/common", | 
|  29     "//mojo/edk/js", |  28     "//mojo/edk/js", | 
|  30     "//mojo/edk/test:run_all_unittests", |  29     "//mojo/edk/test:run_all_unittests", | 
|  31     "//mojo/public/cpp/bindings", |  30     "//mojo/public/cpp/bindings", | 
|  32     "//mojo/public/cpp/system", |  31     "//mojo/public/cpp/system", | 
|  33     "//mojo/public/js:bindings", |  32     "//mojo/public/js:bindings", | 
|  34   ] |  33   ] | 
|  35  |  34  | 
|  36   sources = [ |  35   sources = [ | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
|  61     "//mojo/public/interfaces/bindings/tests:test_interfaces", |  60     "//mojo/public/interfaces/bindings/tests:test_interfaces", | 
|  62     "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", |  61     "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", | 
|  63     "//mojo/public/js:tests", |  62     "//mojo/public/js:tests", | 
|  64   ] |  63   ] | 
|  65  |  64  | 
|  66   sources = [ |  65   sources = [ | 
|  67     "//mojo/edk/js/handle_unittest.cc", |  66     "//mojo/edk/js/handle_unittest.cc", | 
|  68     "run_js_unittests.cc", |  67     "run_js_unittests.cc", | 
|  69   ] |  68   ] | 
|  70 } |  69 } | 
| OLD | NEW |