diff options
| author | yzshen <yzshen@chromium.org> | 2015-12-09 09:36:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 17:37:38 +0000 |
| commit | ba7c43fa399baec9814cb1519500a9ffa0fd774f (patch) | |
| tree | 1ecd0c0bd21972e1230f79984ac802ec3626f924 /mojo/mojo_edk_tests.gyp | |
| parent | 37757d6c3f7373303a0713346abc10a1a17cb96b (diff) | |
| download | chromium_src-ba7c43fa399baec9814cb1519500a9ffa0fd774f.zip chromium_src-ba7c43fa399baec9814cb1519500a9ffa0fd774f.tar.gz chromium_src-ba7c43fa399baec9814cb1519500a9ffa0fd774f.tar.bz2 | |
Mojo JS bindings: fix the unittests.
This CL removes the build target with the old EDK and makes the one with the new
EDK compile & pass.
This CL also merges the run_all_unittests.cc in mojo/edk/system and
mojo/edk/test.
BUG=536669
TEST=mojo_js_unittests should be able to run.
Review URL: https://codereview.chromium.org/1511783002
Cr-Commit-Position: refs/heads/master@{#364098}
Diffstat (limited to 'mojo/mojo_edk_tests.gyp')
| -rw-r--r-- | mojo/mojo_edk_tests.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp index 2b11d07..7dd521b 100644 --- a/mojo/mojo_edk_tests.gyp +++ b/mojo/mojo_edk_tests.gyp @@ -18,7 +18,7 @@ # to be built. 'mojo_message_pipe_perftests2', 'mojo_system_unittests2', - 'mojo_js_unittests2', + 'mojo_js_unittests', 'mojo_js_integration_tests2', ], }, @@ -94,7 +94,7 @@ }, { # GN version: //mojo/edk/js/test:js_unittests - 'target_name': 'mojo_js_unittests2', + 'target_name': 'mojo_js_unittests', 'type': 'executable', 'dependencies': [ '../gin/gin.gyp:gin_test', |