Revert "fix fml_unittes is not run during presubmit (flutter#13395)" (f…

…lutter#13425) This reverts commit 4d553cf.
CaseyHillers · Oct 29, 2019 · e569294 · e569294
1 parent f8a7ce5
commit e569294
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/fml/message_loop_task_queues_unittests.cc b/fml/message_loop_task_queues_unittests.cc
@@ -192,19 +192,17 @@ TEST(MessageLoopTaskQueue, ConcurrentQueueAndTaskCreatingCounts) {
   auto creation_func = [&] {
     for (int i = 0; i < num_queues; i++) {
       fml::TaskQueueId queue_id = task_queues->CreateTaskQueue();
-      int limit = queue_id - base_queue_id;
-      created[limit] = true;
+      created[queue_id - base_queue_id] = true;
 
-      for (int cur_q = 1; cur_q < limit; cur_q++) {
-        if (created[cur_q]) {
-          std::scoped_lock counter(task_count_mutex[cur_q]);
+      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]);
           int cur_num_tasks = rand() % 10;
           for (int k = 0; k < cur_num_tasks; k++) {
             task_queues->RegisterTask(
-                fml::TaskQueueId(base_queue_id + cur_q), [] {},
-                fml::TimePoint::Now());
+                fml::TaskQueueId(cur_q), [] {}, fml::TimePoint::Now());
           }
-          num_tasks[cur_q] += cur_num_tasks;
+          num_tasks[cur_q - base_queue_id] += cur_num_tasks;
         }
       }
     }

diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -21,7 +21,7 @@
 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'