Skip to content

Commit 4f598f2

Browse files
Treehugger Robotandroid-build-merge-worker-robot
Treehugger Robot
authored and
android-build-merge-worker-robot
committed
Merge "Update inputflinger TEST_MAPPING to use test_module_config entries" into main am: bd28005
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3379239 Change-Id: I00d32e6634f8a88a1c5008159eeb8dcf7f91a17f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents de330cd + bd28005 commit 4f598f2

1 file changed

Lines changed: 18 additions & 165 deletions

File tree

‎services/inputflinger/TEST_MAPPING‎

Lines changed: 18 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -35,109 +35,34 @@
3535
]
3636
},
3737
{
38-
"name": "CtsHardwareTestCases",
39-
"options": [
40-
{
41-
"include-filter": "android.hardware.input.cts.tests"
42-
},
43-
{
44-
"exclude-annotation": "androidx.test.filters.FlakyTest"
45-
}
46-
]
38+
"name": "CtsHardwareTestCases_cts_tests"
4739
},
4840
{
4941
"name": "CtsInputTestCases"
5042
},
5143
{
52-
"name": "CtsViewTestCases",
53-
"options": [
54-
{
55-
"include-filter": "android.view.cts.input"
56-
}
57-
]
44+
"name": "CtsViewTestCases_cts_input"
5845
},
5946
{
60-
"name": "CtsViewTestCases",
61-
"options": [
62-
{
63-
"include-filter": "android.view.cts.HoverTest"
64-
},
65-
{
66-
"include-filter": "android.view.cts.MotionEventTest"
67-
},
68-
{
69-
"include-filter": "android.view.cts.PointerCaptureTest"
70-
},
71-
{
72-
"include-filter": "android.view.cts.TooltipTest"
73-
},
74-
{
75-
"include-filter": "android.view.cts.TouchDelegateTest"
76-
},
77-
{
78-
"include-filter": "android.view.cts.VerifyInputEventTest"
79-
},
80-
{
81-
"include-filter": "android.view.cts.ViewTest"
82-
},
83-
{
84-
"include-filter": "android.view.cts.ViewUnbufferedTest"
85-
}
86-
]
47+
"name": "CtsViewTestCases_input_related"
8748
},
8849
{
89-
"name": "CtsWidgetTestCases",
90-
"options": [
91-
{
92-
"include-filter": "android.widget.cts.NumberPickerTest"
93-
},
94-
{
95-
"include-filter": "android.widget.cts.SeekBarTest"
96-
}
97-
]
50+
"name": "CtsWidgetTestCases_seekbar_and_numberpicker"
9851
},
9952
{
100-
"name": "FrameworksCoreTests",
101-
"options": [
102-
{
103-
"include-filter": "android.hardware.input"
104-
}
105-
]
53+
"name": "FrameworksCoreTests_hardware_input"
10654
},
10755
{
108-
"name": "FrameworksCoreTests",
109-
"options": [
110-
{
111-
"include-filter": "android.view.VerifiedKeyEventTest"
112-
},
113-
{
114-
"include-filter": "android.view.VerifiedMotionEventTest"
115-
}
116-
]
56+
"name": "FrameworksCoreTests_view_verified"
11757
},
11858
{
119-
"name": "CtsAppTestCases",
120-
"options": [
121-
{
122-
"include-filter": "android.app.cts.ToolbarActionBarTest"
123-
}
124-
]
59+
"name": "CtsAppTestCases_cts_toolbaractionbartest"
12560
},
12661
{
127-
"name": "FrameworksServicesTests",
128-
"options": [
129-
{
130-
"include-filter": "com.android.server.input"
131-
}
132-
]
62+
"name": "FrameworksServicesTests_android_server_input"
13363
},
13464
{
135-
"name": "CtsSecurityTestCases",
136-
"options": [
137-
{
138-
"include-filter": "android.security.cts.MotionEventTest"
139-
}
140-
]
65+
"name": "CtsSecurityTestCases_cts_motioneventtest"
14166
},
14267
{
14368
"name": "CtsSecurityBulletinHostTestCases",
@@ -156,12 +81,7 @@
15681
],
15782
"postsubmit": [
15883
{
159-
"name": "CtsWindowManagerDeviceWindow",
160-
"options": [
161-
{
162-
"include-filter": "android.server.wm.window.WindowInputTests"
163-
}
164-
]
84+
"name": "CtsWindowManagerDeviceWindow_window_windowinputtests"
16585
},
16686
{
16787
"name": "libinput_tests"
@@ -187,98 +107,31 @@
187107
]
188108
},
189109
{
190-
"name": "CtsHardwareTestCases",
191-
"options": [
192-
{
193-
"include-filter": "android.hardware.input.cts.tests"
194-
}
195-
]
110+
"name": "CtsHardwareTestCases_cts_tests"
196111
},
197112
{
198113
"name": "CtsInputTestCases"
199114
},
200115
{
201-
"name": "CtsViewTestCases",
202-
"options": [
203-
{
204-
"include-filter": "android.view.cts.input"
205-
}
206-
]
116+
"name": "CtsViewTestCases_cts_input"
207117
},
208118
{
209-
"name": "CtsViewTestCases",
210-
"options": [
211-
{
212-
"include-filter": "android.view.cts.HoverTest"
213-
},
214-
{
215-
"include-filter": "android.view.cts.MotionEventTest"
216-
},
217-
{
218-
"include-filter": "android.view.cts.PointerCaptureTest"
219-
},
220-
{
221-
"include-filter": "android.view.cts.TooltipTest"
222-
},
223-
{
224-
"include-filter": "android.view.cts.TouchDelegateTest"
225-
},
226-
{
227-
"include-filter": "android.view.cts.VerifyInputEventTest"
228-
},
229-
{
230-
"include-filter": "android.view.cts.ViewTest"
231-
},
232-
{
233-
"include-filter": "android.view.cts.ViewUnbufferedTest"
234-
}
235-
]
119+
"name": "CtsViewTestCases_input_related"
236120
},
237121
{
238-
"name": "CtsWidgetTestCases",
239-
"options": [
240-
{
241-
"include-filter": "android.widget.cts.NumberPickerTest"
242-
},
243-
{
244-
"include-filter": "android.widget.cts.SeekBarTest"
245-
}
246-
]
122+
"name": "CtsWidgetTestCases_seekbar_and_numberpicker"
247123
},
248124
{
249-
"name": "FrameworksCoreTests",
250-
"options": [
251-
{
252-
"include-filter": "android.view.VerifiedKeyEventTest"
253-
},
254-
{
255-
"include-filter": "android.view.VerifiedMotionEventTest"
256-
}
257-
]
125+
"name": "FrameworksCoreTests_view_verified"
258126
},
259127
{
260-
"name": "CtsAppTestCases",
261-
"options": [
262-
{
263-
"include-filter": "android.app.cts.ToolbarActionBarTest"
264-
}
265-
]
128+
"name": "CtsAppTestCases_cts_toolbaractionbartest"
266129
},
267130
{
268-
"name": "FrameworksServicesTests",
269-
"options": [
270-
{
271-
"include-filter": "com.android.server.input"
272-
}
273-
]
131+
"name": "FrameworksServicesTests_server_input"
274132
},
275133
{
276-
"name": "CtsSecurityTestCases",
277-
"options": [
278-
{
279-
"include-filter": "android.security.cts.MotionEventTest"
280-
}
281-
]
134+
"name": "CtsSecurityTestCases_cts_motioneventtest"
282135
},
283136
{
284137
"name": "CtsSecurityBulletinHostTestCases",

0 commit comments

Comments
 (0)