[flutter] Re-enable Flutter driver tests
Needs: https://github.com/flutter/flutter/pull/30458
Change-Id: Ib1ab5e2cfec8885356418fed80a8a5808897d4c7
diff --git a/examples/test/driver_example_mod/BUILD.gn b/examples/test/driver_example_mod/BUILD.gn
index ef3a87d..cceceae 100644
--- a/examples/test/driver_example_mod/BUILD.gn
+++ b/examples/test/driver_example_mod/BUILD.gn
@@ -60,10 +60,10 @@
# Flutter driver is only available in debug builds, so don't try to run in
# release CI/CQ.
- # if (is_debug) {
- # environments += [
- # nuc_env,
- # vim2_env,
- # ]
- # }
+ if (is_debug) {
+ environments += [
+ nuc_env,
+ vim2_env,
+ ]
+ }
}
diff --git a/examples/test/driver_example_mod/test/driver_example_mod_test.dart b/examples/test/driver_example_mod/test/driver_example_mod_test.dart
index 72ca1ff..ac4ff09 100644
--- a/examples/test/driver_example_mod/test/driver_example_mod_test.dart
+++ b/examples/test/driver_example_mod/test/driver_example_mod_test.dart
@@ -8,7 +8,7 @@
import 'package:fuchsia_services/services.dart';
import 'package:test/test.dart';
-const Pattern _isolatePattern = 'driver_example_mod';
+const Pattern _isolatePattern = 'driver_example_mod.cmx';
const _testAppUrl =
'fuchsia-pkg://fuchsia.com/driver_example_mod#meta/driver_example_mod.cmx';
const _basemgrUrl = 'fuchsia-pkg://fuchsia.com/basemgr#meta/basemgr.cmx';
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
index a648fe1..868dabd 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
+++ b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
@@ -70,10 +70,10 @@
# Flutter driver is only available in debug builds, so don't try to run in
# release CI/CQ.
- # if (is_debug) {
- # environments += [
- # nuc_env,
- # vim2_env,
- # ]
- # }
+ if (is_debug) {
+ environments += [
+ nuc_env,
+ vim2_env,
+ ]
+ }
}
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/test/slider_mod_widget_test.dart b/public/dart/fuchsia_modular/examples/slider_mod/test/slider_mod_widget_test.dart
index b7cabcc..ecc6c2e 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/test/slider_mod_widget_test.dart
+++ b/public/dart/fuchsia_modular/examples/slider_mod/test/slider_mod_widget_test.dart
@@ -9,7 +9,7 @@
import 'package:fuchsia_services/services.dart';
import 'package:test/test.dart';
-const Pattern _isolatePattern = 'slider_mod';
+const Pattern _isolatePattern = 'slider_mod.cmx';
const _testAppUrl = 'fuchsia-pkg://fuchsia.com/slider_mod#meta/slider_mod.cmx';
const _basemgrUrl = 'fuchsia-pkg://fuchsia.com/basemgr#meta/basemgr.cmx';
diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index 6985487..d0e934f 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -35,10 +35,10 @@
}
# Whether experimental space dart mode is enabled for Flutter applications.
- flutter_space_dart = true
+ flutter_space_dart = !is_debug
# Whether experimental space dart mode is enabled for Dart applications.
- dart_space_dart = true
+ dart_space_dart = !is_debug
}
declare_args() {
@@ -281,11 +281,9 @@
}
gen_bytecode = false
- interpreter = false
if ((defined(invoker.space_dart) && invoker.space_dart) ||
flutter_space_dart) {
gen_bytecode = true
- interpreter = true
}
product_suffix = ""
@@ -314,11 +312,9 @@
}
gen_bytecode = false
- interpreter = false
if ((defined(invoker.space_dart) && invoker.space_dart) ||
dart_space_dart) {
gen_bytecode = true
- interpreter = true
}
runtime_meta =
"//topaz/runtime/dart_runner/meta/jit${product_suffix}_runtime"
diff --git a/runtime/flutter_runner/engine.cc b/runtime/flutter_runner/engine.cc
index 94d10f6..d17d05d 100644
--- a/runtime/flutter_runner/engine.cc
+++ b/runtime/flutter_runner/engine.cc
@@ -219,6 +219,8 @@
settings_.advisory_script_uri = thread_label_;
+ settings_.advisory_script_entrypoint = thread_label_;
+
settings_.root_isolate_create_callback =
std::bind(&Engine::OnMainIsolateStart, this);
