Skip to content

Commit ed95cfa

Browse files
George WrightNoamDev
George Wright
authored andcommitted
Disable unit tests using --gtest-filter instead of at compile time (flutter#16472)
1 parent f952b8a commit ed95cfa

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

fml/BUILD.gn

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,14 @@ executable("fml_unittests") {
230230
sources = [
231231
"base32_unittest.cc",
232232
"command_line_unittest.cc",
233+
"file_unittest.cc",
233234
"gpu_thread_merger_unittests.cc",
234235
"memory/ref_counted_unittest.cc",
235236
"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",
236241
"paths_unittests.cc",
237242
"platform/darwin/string_range_sanitization_unittests.mm",
238243
"synchronization/count_down_latch_unittests.cc",
@@ -246,23 +251,6 @@ executable("fml_unittests") {
246251
"time/time_unittest.cc",
247252
]
248253

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-
266254
deps = [
267255
":fml_fixtures",
268256
"//flutter/fml",

testing/fuchsia/run_tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ 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.
5254
./fuchsia_ctl -d $device_name test \
5355
-f fml_tests-0.far \
54-
-t fml_tests
56+
-t fml_tests \
57+
-a "--gtest_filter=-MessageLoop*:Message*:FileTest*"
5558

5659
./fuchsia_ctl -d $device_name test \
5760
-f flow_tests-0.far \

0 commit comments

Comments
 (0)