Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add panel resolution value in merge_test_matrix script. #64

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Add panel resolution value in merge_test_matrix script. #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions Tools/PC/merge_test_matrix/merge_test_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"Bluetooth": "BT",
"WWAN": "WWAN",
"Screen": "Touchscreen",
"Panel Resolution": "Panel-Resolution",
"Touchpad": "Touchpad",
"Webcam": "Webcam",
"Fingerprint": "Fingerprint",
Expand Down Expand Up @@ -130,6 +131,10 @@ def touchscreen(self):
else:
return "N/A"

@property
def panel(self):
return self._data.get("Panel-Resolution")

@property
def webcam(self):
webcams = self._data.get("Webcam")
Expand Down Expand Up @@ -367,6 +372,7 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
"Bluetooth",
"WWAN",
"Screen",
"Panel Resolution",
"Touchpad",
"Webcam",
"Fingerprint",
Expand Down Expand Up @@ -400,10 +406,11 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
"bluetooth": 11,
"wwan": 12,
"touchscreen": 13,
"touchpad": 14,
"webcam": 15,
"fingerprint": 16,
"disk": 17,
"panel": 14,
"touchpad": 15,
"webcam": 16,
"fingerprint": 17,
"disk": 18,
}
tmp_data = {}

Expand Down Expand Up @@ -434,11 +441,11 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
)
# Write empty data for other
worksheet.write(
18, row, "",
19, row, "",
WorkbookFormater.default_format(workbook))
# Write empty data for test scope
worksheet.write(
19, row, "",
20, row, "",
WorkbookFormater.default_format(workbook))

if no_highlight:
Expand Down Expand Up @@ -479,19 +486,23 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
WorkbookFormater.default_format(workbook),
)
worksheet.write(
14, row, parser.touchpad,
14, row, parser.panel,
WorkbookFormater.default_format(workbook)
)
worksheet.write(
15, row, parser.touchpad,
WorkbookFormater.default_format(workbook)
)
worksheet.write(
15, row, parser.webcam,
16, row, parser.webcam,
WorkbookFormater.default_format(workbook)
)
worksheet.write(
16, row, parser.fingerprint,
17, row, parser.fingerprint,
WorkbookFormater.default_format(workbook),
)
worksheet.write(
17, row, parser.disk,
18, row, parser.disk,
WorkbookFormater.default_format(workbook)
)
else:
Expand Down
Loading