diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | cli/BUILD.gn | 2 | ||||
| -rw-r--r-- | core/libdeno/BUILD.gn | 2 | ||||
| -rw-r--r-- | core/libdeno/file_util_test.cc | 2 | ||||
| -rwxr-xr-x | tools/test.py | 12 |
6 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 3487c57a7..9e60126d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,6 @@ jobs: # Call gn gen again to make sure new args are recognized. - third_party/depot_tools/gn gen target/debug - export ASAN_OPTIONS=detect_leaks=1 - - ./tools/build.py test_cc - - ./target/debug/test_cc + - ./tools/build.py libdeno_test + - ./target/debug/libdeno_test @@ -4,10 +4,10 @@ group("default") { testonly = true deps = [ ":hyper_hello", + "cli:cli_test", "cli:deno", - "cli:test_rs", "core:default", - "core/libdeno:test_cc", + "core/libdeno:libdeno_test", ] } diff --git a/cli/BUILD.gn b/cli/BUILD.gn index bfa3fe427..eedceddc7 100644 --- a/cli/BUILD.gn +++ b/cli/BUILD.gn @@ -162,7 +162,7 @@ rust_executable("deno") { ] } -rust_test("test_rs") { +rust_test("cli_test") { source_root = "main.rs" extern = main_extern deps = [ diff --git a/core/libdeno/BUILD.gn b/core/libdeno/BUILD.gn index eeec14eb5..8ad3dccc3 100644 --- a/core/libdeno/BUILD.gn +++ b/core/libdeno/BUILD.gn @@ -80,7 +80,7 @@ v8_executable("snapshot_creator") { configs = [ ":deno_config" ] } -v8_executable("test_cc") { +v8_executable("libdeno_test") { testonly = true sources = [ "file_util_test.cc", diff --git a/core/libdeno/file_util_test.cc b/core/libdeno/file_util_test.cc index 80c878044..863a31d48 100644 --- a/core/libdeno/file_util_test.cc +++ b/core/libdeno/file_util_test.cc @@ -38,7 +38,7 @@ TEST(FileUtilTest, ExePath) { EXPECT_TRUE(exe_path.find("/") == 0 || exe_path.find(":\\") == 1); // FIlename is the name of the test binary. std::string exe_filename = deno::Basename(exe_path); - EXPECT_EQ(exe_filename.find("test_cc"), 0u); + EXPECT_EQ(exe_filename.find("libdeno_test"), 0u); // Path exists (also tests ReadFileToString). std::string contents; EXPECT_TRUE(deno::ReadFileToString(exe_path.c_str(), &contents)); diff --git a/tools/test.py b/tools/test.py index 7fddfc2ff..e4914ae50 100755 --- a/tools/test.py +++ b/tools/test.py @@ -74,13 +74,13 @@ def main(argv): "tools/ts_library_builder/test.ts" ]) - test_cc = os.path.join(build_dir, "test_cc" + executable_suffix) - check_exists(test_cc) - run([test_cc]) + libdeno_test = os.path.join(build_dir, "libdeno_test" + executable_suffix) + check_exists(libdeno_test) + run([libdeno_test]) - test_rs = os.path.join(build_dir, "test_rs" + executable_suffix) - check_exists(test_rs) - run([test_rs]) + cli_test = os.path.join(build_dir, "cli_test" + executable_suffix) + check_exists(cli_test) + run([cli_test]) deno_core_test = os.path.join(build_dir, "deno_core_test" + executable_suffix) |