[machineserver] Fix Intel CPU parsing bug. Bug: b/294372732 Change-Id: I328625f01636d0473802777cd3415b5dc4cfc1df Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/735059 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Commit-Queue: Leandro Lovisolo <lovisolo@google.com> Auto-Submit: Leandro Lovisolo <lovisolo@google.com>
diff --git a/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform.go b/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform.go index 5828100..8ed9985 100644 --- a/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform.go +++ b/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform.go
@@ -57,6 +57,7 @@ regexes := []*regexp.Regexp{ regexp.MustCompile(` ([a-zA-Z]\d-\d{4}[A-Z]{0,2} [vV]\d) `), regexp.MustCompile(` ([a-zA-Z]\d-\d{4}[A-Z]{0,2}) `), + regexp.MustCompile(` ([a-zA-Z]\d-\d{4}[A-Z]\d) `), regexp.MustCompile(` ([A-Z]\d{4}[A-Z]{0,2}) `), regexp.MustCompile(` ((:?[A-Z][a-z]+ )+GCE)`), }
diff --git a/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform_test.go b/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform_test.go index 2f0b066..970ede4 100644 --- a/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform_test.go +++ b/machine/go/test_machine_monitor/standalone/crossplatform/crossplatform_test.go
@@ -46,6 +46,12 @@ "i7-9750H v2") test( + "Newer Intel model numbers are extracted", + "GenuineIntel", + "11th Gen Intel(R) Core(TM) i5-1135G7 @ 2.40GHz", + "i5-1135G7") + + test( "Non-Intel vendors result in the brand string", "Wackadoo Inc.", "Wackadoo ALU i5-9600",