From e92c42f0aa4c481010e6e24106c19cd19a35754b Mon Sep 17 00:00:00 2001
From: chunhtai <47866232+chunhtai@users.noreply.github.com>
Date: Tue, 29 Oct 2019 15:31:25 -0700
Subject: [PATCH] fix fml_unittes is not run during presubmit
 (flutter/engine#13395)

---
 .../fml/message_loop_task_queues_unittests.cc      | 14 ++++++++------
 engine/src/flutter/testing/run_tests.py            |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/engine/src/flutter/fml/message_loop_task_queues_unittests.cc b/engine/src/flutter/fml/message_loop_task_queues_unittests.cc
index 1e4b0097f8f..559e3152ac1 100644
--- a/engine/src/flutter/fml/message_loop_task_queues_unittests.cc
+++ b/engine/src/flutter/fml/message_loop_task_queues_unittests.cc
@@ -192,17 +192,19 @@ TEST(MessageLoopTaskQueue, ConcurrentQueueAndTaskCreatingCounts) {
   auto creation_func = [&] {
     for (int i = 0; i < num_queues; i++) {
       fml::TaskQueueId queue_id = task_queues->CreateTaskQueue();
-      created[queue_id - base_queue_id] = true;
+      int limit = queue_id - base_queue_id;
+      created[limit] = true;
 
-      for (int cur_q = 1; cur_q < i; cur_q++) {
-        if (created[cur_q - base_queue_id]) {
-          std::scoped_lock counter(task_count_mutex[cur_q - base_queue_id]);
+      for (int cur_q = 1; cur_q < limit; cur_q++) {
+        if (created[cur_q]) {
+          std::scoped_lock counter(task_count_mutex[cur_q]);
           int cur_num_tasks = rand() % 10;
           for (int k = 0; k < cur_num_tasks; k++) {
             task_queues->RegisterTask(
-                fml::TaskQueueId(cur_q), [] {}, fml::TimePoint::Now());
+                fml::TaskQueueId(base_queue_id + cur_q), [] {},
+                fml::TimePoint::Now());
           }
-          num_tasks[cur_q - base_queue_id] += cur_num_tasks;
+          num_tasks[cur_q] += cur_num_tasks;
         }
       }
     }
diff --git a/engine/src/flutter/testing/run_tests.py b/engine/src/flutter/testing/run_tests.py
index 29639d29cd6..67b53eb2449 100755
--- a/engine/src/flutter/testing/run_tests.py
+++ b/engine/src/flutter/testing/run_tests.py
@@ -21,7 +21,7 @@ fonts_dir = os.path.join(buildroot_dir, 'flutter', 'third_party', 'txt', 'third_
 roboto_font_path = os.path.join(fonts_dir, 'Roboto-Regular.ttf')
 dart_tests_dir = os.path.join(buildroot_dir, 'flutter', 'testing', 'dart',)
 
-time_sensitve_test_flag = '--gtest_filter="-*TimeSensitiveTest*"'
+time_sensitve_test_flag = '--gtest_filter=-*TimeSensitiveTest*'
 
 def IsMac():
   return sys.platform == 'darwin'