Index: components/leveldb/BUILD.gn |
diff --git a/components/leveldb/BUILD.gn b/components/leveldb/BUILD.gn |
index 5930be901afad6b06844cce875706b8d421a14cd..ed49e2a56c7616b4b0aad00b85d76337644d4d11 100644 |
--- a/components/leveldb/BUILD.gn |
+++ b/components/leveldb/BUILD.gn |
@@ -5,6 +5,7 @@ |
import("//services/catalog/public/tools/catalog.gni") |
import("//services/service_manager/public/cpp/service.gni") |
import("//services/service_manager/public/service_manifest.gni") |
+import("//services/service_manager/public/tools/test/service_test.gni") |
import("//testing/test.gni") |
static_library("lib") { |
@@ -60,24 +61,22 @@ service_manifest("manifest") { |
source = "manifest.json" |
} |
-test("leveldb_service_unittests") { |
+service_test("leveldb_service_unittests") { |
sources = [ |
"leveldb_service_unittest.cc", |
"remote_iterator_unittest.cc", |
- "run_all_unittests.cc", |
] |
+ catalog = ":leveldb_service_unittests_catalog" |
+ |
deps = [ |
"//base", |
- "//base/test:test_support", |
"//components/filesystem/public/interfaces", |
"//components/leveldb/public/cpp", |
"//components/leveldb/public/interfaces", |
"//mojo/common", |
- "//mojo/edk/system", |
"//mojo/public/cpp/bindings", |
"//mojo/public/cpp/system", |
- "//services/catalog:lib", |
"//services/service_manager/public/cpp:service_test_support", |
"//services/service_manager/public/cpp:sources", |
"//third_party/leveldatabase", |
@@ -85,7 +84,6 @@ test("leveldb_service_unittests") { |
data_deps = [ |
":leveldb", |
- ":leveldb_service_unittests_catalog_copy", |
"//components/filesystem:filesystem", |
] |
} |
@@ -102,13 +100,3 @@ catalog("leveldb_service_unittests_catalog") { |
"//components/filesystem:manifest", |
] |
} |
- |
-copy("leveldb_service_unittests_catalog_copy") { |
- sources = get_target_outputs(":leveldb_service_unittests_catalog") |
- outputs = [ |
- "${root_out_dir}/leveldb_service_unittests_catalog.json", |
- ] |
- deps = [ |
- ":leveldb_service_unittests_catalog", |
- ] |
-} |