From bc51cf62bbc0955b35f651903cb89afb765a1830 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@gmail.com>
Date: Thu, 18 Apr 2019 12:15:45 -0700
Subject: [PATCH] Merge runtime lifecycle unittests into the base test target.
 (flutter/engine#8634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`//flutter/runtime: runtime_lifecycle_unittests` was added because the these assumed that there was no VM already running in the process. Running other tests in the base target would mess up that assumption. Now that all test targets have been updated to make sure the VM instance does not leak, the tests in this target can be merged.

LUCI bots don’t need to be patched as these tests were only ever run on the trybots.
---
 engine/src/flutter/BUILD.gn             |  1 -
 engine/src/flutter/runtime/BUILD.gn     | 17 +----------------
 engine/src/flutter/testing/run_tests.sh |  3 ---
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/engine/src/flutter/BUILD.gn b/engine/src/flutter/BUILD.gn
index a3c33e6fef6..1ae4a19c648 100644
--- a/engine/src/flutter/BUILD.gn
+++ b/engine/src/flutter/BUILD.gn
@@ -47,7 +47,6 @@ group("flutter") {
     public_deps += [
       "$flutter_root/flow:flow_unittests",
       "$flutter_root/fml:fml_unittests",
-      "$flutter_root/runtime:runtime_lifecycle_unittests",
       "$flutter_root/runtime:runtime_unittests",
       "$flutter_root/shell/common:shell_unittests",
       "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn
index 4ae61ac3b46..9d6f0d80ea6 100644
--- a/engine/src/flutter/runtime/BUILD.gn
+++ b/engine/src/flutter/runtime/BUILD.gn
@@ -130,6 +130,7 @@ executable("runtime_unittests") {
 
   sources = [
     "dart_isolate_unittests.cc",
+    "dart_lifecycle_unittests.cc",
     "dart_service_isolate_unittests.cc",
     "dart_vm_unittests.cc",
   ]
@@ -142,19 +143,3 @@ executable("runtime_unittests") {
     ldflags = [ "-rdynamic" ]
   }
 }
-
-executable("runtime_lifecycle_unittests") {
-  testonly = true
-
-  sources = [
-    "dart_lifecycle_unittests.cc",
-  ]
-
-  deps = [
-    ":runtime_unittests_common",
-  ]
-
-  if (is_linux) {
-    ldflags = [ "-rdynamic" ]
-  }
-}
diff --git a/engine/src/flutter/testing/run_tests.sh b/engine/src/flutter/testing/run_tests.sh
index 87f68897055..621743aa809 100755
--- a/engine/src/flutter/testing/run_tests.sh
+++ b/engine/src/flutter/testing/run_tests.sh
@@ -35,9 +35,6 @@ echo "Running fml_unittests..."
 echo "Running runtime_unittests..."
 "$HOST_DIR/runtime_unittests"
 
-echo "Running runtime_lifecycle_unittests..."
-"$HOST_DIR/runtime_lifecycle_unittests"
-
 echo "Running shell_unittests..."
 "$HOST_DIR/shell_unittests"