Skip to content

Commit bbc2f3b

Browse files
rbraunsteinrbraunstein
committed
Update inputflinger TEST_MAPPING to use test_module_config entries
go/test-mapping-config I ran the presubmit before and after the change and verified the test counts are what they were before, except in the case where CtsViewTests is now running more tests because it is split into two modules. (instrumentation tests don't allow mixing include-filter of TestCases and packages, and this change separates them) % diff <(grep -A25 ^Summary if.atest.new.log) <(grep -A25 ^Summary if.atest.orig.log ) aosp_cf_x86_64_phone[4:33:55]/0 4c4 < x86_64 CtsAppTestCases_cts_toolbaractionbartest:android.app.cts: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0 Change-Id: I3f4859e36d5ac5213305e666e11803e48a382df1 --- > x86_64 CtsAppTestCases:android.app.cts: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0 6c6 < x86_64 CtsHardwareTestCases_cts_tests:android.hardware.cts: Passed: 228, Failed: 8, Ignored: 4, Assumption Failed: 5 --- > x86_64 CtsHardwareTestCases:android.hardware.cts: Passed: 228, Failed: 4, Ignored: 4, Assumption Failed: 5 8,11c8,10 < x86_64 CtsSecurityTestCases_cts_motioneventtest:android.security.cts: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0 < x86_64 CtsViewTestCases_cts_input:android.view.cts: Passed: 25, Failed: 0, Ignored: 0, Assumption Failed: 0 < x86_64 CtsViewTestCases_input_related:android.view.cts: Passed: 384, Failed: 0, Ignored: 0, Assumption Failed: 2 < x86_64 CtsWidgetTestCases_seekbar_and_numberpicker:android.widget.cts: Passed: 16, Failed: 0, Ignored: 0, Assumption Failed: 0 --- > x86_64 CtsSecurityTestCases:android.security.cts: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0 > x86_64 CtsViewTestCases:android.view.cts: Passed: 384, Failed: 0, Ignored: 0, Assumption Failed: 2 > x86_64 CtsWidgetTestCases:android.widget.cts: Passed: 16, Failed: 0, Ignored: 0, Assumption Failed: 0 13,14c12 < x86_64 FrameworksCoreTests_hardware_input:com.android.frameworks.coretests: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0 < x86_64 FrameworksCoreTests_view_verified:com.android.frameworks.coretests: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0 --- > x86_64 FrameworksCoreTests:com.android.frameworks.coretests: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0 25,26c23,26 Before and after the change, range atest, and came up with the diff above. Test: atest -v -p .:presubmit |& tee if.atest.new.log Fixes: 379689165 Test-Mapping-Slo-Bypass-Bug: b/335015078 Change-Id: I37046e246e48356ff0bd7b3d29322b1ddb3a7cc3
1 parent eb82879 commit bbc2f3b

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",
@@ -153,12 +78,7 @@
15378
],
15479
"postsubmit": [
15580
{
156-
"name": "CtsWindowManagerDeviceWindow",
157-
"options": [
158-
{
159-
"include-filter": "android.server.wm.window.WindowInputTests"
160-
}
161-
]
81+
"name": "CtsWindowManagerDeviceWindow_window_windowinputtests"
16282
},
16383
{
16484
"name": "libinput_tests"
@@ -184,98 +104,31 @@
184104
]
185105
},
186106
{
187-
"name": "CtsHardwareTestCases",
188-
"options": [
189-
{
190-
"include-filter": "android.hardware.input.cts.tests"
191-
}
192-
]
107+
"name": "CtsHardwareTestCases_cts_tests"
193108
},
194109
{
195110
"name": "CtsInputTestCases"
196111
},
197112
{
198-
"name": "CtsViewTestCases",
199-
"options": [
200-
{
201-
"include-filter": "android.view.cts.input"
202-
}
203-
]
113+
"name": "CtsViewTestCases_cts_input"
204114
},
205115
{
206-
"name": "CtsViewTestCases",
207-
"options": [
208-
{
209-
"include-filter": "android.view.cts.HoverTest"
210-
},
211-
{
212-
"include-filter": "android.view.cts.MotionEventTest"
213-
},
214-
{
215-
"include-filter": "android.view.cts.PointerCaptureTest"
216-
},
217-
{
218-
"include-filter": "android.view.cts.TooltipTest"
219-
},
220-
{
221-
"include-filter": "android.view.cts.TouchDelegateTest"
222-
},
223-
{
224-
"include-filter": "android.view.cts.VerifyInputEventTest"
225-
},
226-
{
227-
"include-filter": "android.view.cts.ViewTest"
228-
},
229-
{
230-
"include-filter": "android.view.cts.ViewUnbufferedTest"
231-
}
232-
]
116+
"name": "CtsViewTestCases_input_related"
233117
},
234118
{
235-
"name": "CtsWidgetTestCases",
236-
"options": [
237-
{
238-
"include-filter": "android.widget.cts.NumberPickerTest"
239-
},
240-
{
241-
"include-filter": "android.widget.cts.SeekBarTest"
242-
}
243-
]
119+
"name": "CtsWidgetTestCases_seekbar_and_numberpicker"
244120
},
245121
{
246-
"name": "FrameworksCoreTests",
247-
"options": [
248-
{
249-
"include-filter": "android.view.VerifiedKeyEventTest"
250-
},
251-
{
252-
"include-filter": "android.view.VerifiedMotionEventTest"
253-
}
254-
]
122+
"name": "FrameworksCoreTests_view_verified"
255123
},
256124
{
257-
"name": "CtsAppTestCases",
258-
"options": [
259-
{
260-
"include-filter": "android.app.cts.ToolbarActionBarTest"
261-
}
262-
]
125+
"name": "CtsAppTestCases_cts_toolbaractionbartest"
263126
},
264127
{
265-
"name": "FrameworksServicesTests",
266-
"options": [
267-
{
268-
"include-filter": "com.android.server.input"
269-
}
270-
]
128+
"name": "FrameworksServicesTests_server_input"
271129
},
272130
{
273-
"name": "CtsSecurityTestCases",
274-
"options": [
275-
{
276-
"include-filter": "android.security.cts.MotionEventTest"
277-
}
278-
]
131+
"name": "CtsSecurityTestCases_cts_motioneventtest"
279132
},
280133
{
281134
"name": "CtsSecurityBulletinHostTestCases",

0 commit comments

Comments
 (0)