diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2018-07-12 13:41:19 -0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2018-07-13 14:38:50 -0400 |
| commit | 2c30a25568b16c5f7cb288a14dbb0a2edf08cd5c (patch) | |
| tree | 5ea10ac5d45edf46141dd43594a178902f84a753 | |
| parent | 936c8f6e4c18aa9355c01cbf7ac2834d9ea14e45 (diff) | |
Move C++ test main function to its own file.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | src/mock_runtime_test.cc | 7 | ||||
| -rw-r--r-- | src/test.cc | 11 |
4 files changed, 15 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index d5e4af5d1..54b3f3bef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,10 +42,10 @@ install: - gn args $BUILD_PATH --list - ccache -s # Travis hangs without -j2 argument to ninja. - - ninja -j2 -C $BUILD_PATH mock_runtime_test handlers_test deno_cc deno_cc_nosnapshot deno deno_nosnapshot + - ninja -j2 -C $BUILD_PATH test_cc handlers_test deno_cc deno_cc_nosnapshot deno deno_nosnapshot script: - ./tools/lint.py - - $BUILD_PATH/mock_runtime_test + - $BUILD_PATH/test_cc - $BUILD_PATH/handlers_test - $BUILD_PATH/deno_cc foo bar - $BUILD_PATH/deno_cc_nosnapshot foo bar @@ -72,13 +72,14 @@ executable("deno_cc_nosnapshot") { configs += [ ":deno_config" ] } -executable("mock_runtime_test") { +executable("test_cc") { testonly = true sources = [ "src/file_util_test.cc", "src/flatbuffer_builder_test.cc", "src/from_snapshot.cc", "src/mock_runtime_test.cc", + "src/test.cc", ] deps = [ ":create_snapshot_mock_runtime", diff --git a/src/mock_runtime_test.cc b/src/mock_runtime_test.cc index 19b224950..ef4c1aaab 100644 --- a/src/mock_runtime_test.cc +++ b/src/mock_runtime_test.cc @@ -174,10 +174,3 @@ TEST(MockRuntimeTest, ErrorHandling) { EXPECT_EQ(count, 1); deno_delete(d); } - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - deno_init(); - deno_set_flags(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/src/test.cc b/src/test.cc new file mode 100644 index 000000000..d8b4380d7 --- /dev/null +++ b/src/test.cc @@ -0,0 +1,11 @@ +// Copyright 2018 Ryan Dahl <ry@tinyclouds.org> +// All rights reserved. MIT License. +#include "deno.h" +#include "testing/gtest/include/gtest/gtest.h" + +int main(int argc, char** argv) { + testing::InitGoogleTest(&argc, argv); + deno_init(); + deno_set_flags(&argc, argv); + return RUN_ALL_TESTS(); +} |