Skip to content

Commit 99027f4

Browse files
authored
Revert "Disable unit tests using --gtest-filter instead of at compile time (flutter#16472)"
This reverts commit ed95cfa.
1 parent 9169fc1 commit 99027f4

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

fml/BUILD.gn

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,9 @@ executable("fml_unittests") {
230230
sources = [
231231
"base32_unittest.cc",
232232
"command_line_unittest.cc",
233-
"file_unittest.cc",
234233
"gpu_thread_merger_unittests.cc",
235234
"memory/ref_counted_unittest.cc",
236235
"memory/weak_ptr_unittest.cc",
237-
"message_loop_task_queues_merge_unmerge_unittests.cc",
238-
"message_loop_task_queues_unittests.cc",
239-
"message_loop_unittests.cc",
240-
"message_unittests.cc",
241236
"paths_unittests.cc",
242237
"platform/darwin/string_range_sanitization_unittests.mm",
243238
"synchronization/count_down_latch_unittests.cc",
@@ -251,6 +246,23 @@ executable("fml_unittests") {
251246
"time/time_unittest.cc",
252247
]
253248

249+
# TODO(https://github.com/flutter/flutter/issues/50032) Enable after the
250+
# Fuchsia message loop migration is complete.
251+
if (!is_fuchsia) {
252+
sources += [
253+
"message_loop_task_queues_merge_unmerge_unittests.cc",
254+
"message_loop_task_queues_unittests.cc",
255+
"message_loop_unittests.cc",
256+
"message_unittests.cc",
257+
]
258+
}
259+
260+
# TODO(https://github.com/flutter/flutter/issues/50031):
261+
# Figure out why these tests don't work currently on Fuchsia
262+
if (!is_fuchsia) {
263+
sources += [ "file_unittest.cc" ]
264+
}
265+
254266
deps = [
255267
":fml_fixtures",
256268
"//flutter/fml",

testing/fuchsia/run_tests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,9 @@ done
4949
-f flutter_runner_scenic_tests-0.far \
5050
-t flutter_runner_scenic_tests
5151

52-
# TODO(https://github.com/flutter/flutter/issues/50032) Enable after the
53-
# Fuchsia message loop migration is complete.
5452
./fuchsia_ctl -d $device_name test \
5553
-f fml_tests-0.far \
56-
-t fml_tests \
57-
-a "--gtest_filter=-MessageLoop*:Message*:FileTest*"
54+
-t fml_tests
5855

5956
./fuchsia_ctl -d $device_name test \
6057
-f flow_tests-0.far \

0 commit comments

Comments
 (0)