enable on non-aot

Author: zijiehe-google-com

engine/src/flutter/runtime/dart_plugin_registrant_unittests.cc

@@ -52,7 +52,7 @@ class DartIsolateTest : public FixtureTest {
 };
 
 TEST_F(DartIsolateTest, DartPluginRegistrantIsPresent) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
@@ -103,7 +103,7 @@ TEST_F(DartIsolateTest, DartPluginRegistrantIsPresent) {
 }
 
 TEST_F(DartIsolateTest, DartPluginRegistrantFromBackgroundIsolate) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
@@ -155,7 +155,7 @@ TEST_F(DartIsolateTest, DartPluginRegistrantFromBackgroundIsolate) {
 }
 
 TEST_F(DartIsolateTest, DartPluginRegistrantNotFromBackgroundIsolate) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
@@ -208,7 +208,7 @@ TEST_F(DartIsolateTest, DartPluginRegistrantNotFromBackgroundIsolate) {
 }
 
 TEST_F(DartIsolateTest, DartPluginRegistrantWhenRegisteringBackgroundIsolate) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());

engine/src/flutter/runtime/no_dart_plugin_registrant_unittests.cc

@@ -26,7 +26,7 @@ class DartIsolateTest : public FixtureTest {
 };
 
 TEST_F(DartIsolateTest, DartPluginRegistrantIsNotPresent) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());

engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc

@@ -34,7 +34,7 @@ constexpr static char kTooltip[] = "tooltip";
 #endif
 
 TEST_F(EmbedderTest, CannotProvideMultipleSemanticsCallbacks) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   {
@@ -100,7 +100,7 @@ TEST_F(EmbedderTest, CannotProvideMultipleSemanticsCallbacks) {
 }
 
 TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   auto& context = GetEmbedderContext<EmbedderTestContextSoftware>();
@@ -278,7 +278,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 }
 
 TEST_F(EmbedderA11yTest, A11yStringAttributes) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   auto& context = GetEmbedderContext<EmbedderTestContextSoftware>();
@@ -397,7 +397,7 @@ TEST_F(EmbedderA11yTest, A11yStringAttributes) {
 }
 
 TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   auto& context = GetEmbedderContext<EmbedderTestContextSoftware>();
@@ -573,7 +573,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 }
 
 TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
-#if defined(OS_FUCHSIA)
+#if defined(OS_FUCHSIA) && (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   GTEST_SKIP() << "Dart_LoadELF is not implemented on Fuchsia.";
 #else
   auto& context = GetEmbedderContext<EmbedderTestContextSoftware>();

engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn

@@ -931,11 +931,15 @@ if (enable_unittests) {
         path = "$root_gen_dir/flutter/runtime/assets/plugin_registrant_kernel_blob.bin"
         dest = "assets/plugin_registrant_kernel_blob.bin"
       },
-      {
-        path = "$root_gen_dir/flutter/runtime/assets/plugin_registrant_app_elf_snapshot.so"
-        dest = "assets/plugin_registrant_app_elf_snapshot.so"
-      },
     ]
+    if (is_aot_test) {
+      resources += [
+        {
+          path = "$root_gen_dir/flutter/runtime/assets/plugin_registrant_app_elf_snapshot.so"
+          dest = "assets/plugin_registrant_app_elf_snapshot.so"
+        },
+      ]
+    }
   }
 
   fuchsia_test_archive("no_dart_plugin_registrant_unittests") {
@@ -954,11 +958,15 @@ if (enable_unittests) {
         path = "$root_gen_dir/flutter/runtime/assets/no_plugin_registrant_kernel_blob.bin"
         dest = "assets/no_plugin_registrant_kernel_blob.bin"
       },
-      {
-        path = "$root_gen_dir/flutter/runtime/assets/no_plugin_registrant_app_elf_snapshot.so"
-        dest = "assets/no_plugin_registrant_app_elf_snapshot.so"
-      },
     ]
+    if (is_aot_test) {
+      resources += [
+        {
+          path = "$root_gen_dir/flutter/runtime/assets/no_plugin_registrant_app_elf_snapshot.so"
+          dest = "assets/no_plugin_registrant_app_elf_snapshot.so"
+        },
+      ]
+    }
   }
 
   fuchsia_test_archive("embedder_a11y_unittests") {
@@ -977,11 +985,15 @@ if (enable_unittests) {
         path = "$root_gen_dir/flutter/shell/platform/embedder/assets/kernel_blob.bin"
         dest = "assets/kernel_blob.bin"
       },
-      {
-        path = "$root_gen_dir/flutter/shell/platform/embedder/assets/app_elf_snapshot.so"
-        dest = "assets/app_elf_snapshot.so"
-      },
     ]
+    if (is_aot_test) {
+    resources += [
+          {
+            path = "$root_gen_dir/flutter/shell/platform/embedder/assets/app_elf_snapshot.so"
+            dest = "assets/app_elf_snapshot.so"
+          },
+        ]
+    }
   }
 
   fuchsia_test_archive("embedder_proctable_unittests") {
@@ -1012,11 +1024,15 @@ if (enable_unittests) {
         path = "$root_gen_dir/flutter/third_party/tonic/tests/assets/kernel_blob.bin"
         dest = "assets/kernel_blob.bin"
       },
+    ]
+    if (is_aot_test) {
+resources += [
       {
         path = "$root_gen_dir/flutter/third_party/tonic/tests/assets/app_elf_snapshot.so"
         dest = "assets/app_elf_snapshot.so"
       },
     ]
+    }
   }
 
   # When adding a new dep here, please also ensure the dep is added to

engine/src/flutter/testing/fuchsia/test_suites.yaml

@@ -92,7 +92,7 @@
 - test_command: test run fuchsia-pkg://fuchsia.com/tonic_unittests#meta/tonic_unittests.cm
   disabled: Dart_LoadELF isn't implemented on Fuchsia
   package: tonic_unittests-0.far
-  variant: disabled
+  variant: debug
 - test_command: test run fuchsia-pkg://fuchsia.com/touch-input-test#meta/touch-input-test.cm
   packages:
     - touch-input-test-0.far