Merge pull request #83326 from eeckstein/fix-benchmark-tests

benchmark script tests: make the match string for invalid option errors more flexible

Author: eeckstein

benchmark/scripts/test_Benchmark_Driver.py

@@ -112,7 +112,7 @@ def test_optimization_argument(self):
             [
                 "error:",
                 "argument -o/--optimization: invalid choice: 'bogus'",
-                "(choose from 'O', 'Onone', 'Osize')",
+                "(choose from ",
             ],
             err.getvalue(),
         )

benchmark/scripts/test_compare_perf_tests.py

@@ -860,7 +860,7 @@ def test_format_argument(self):
             )
         self.assertIn(
             "error: argument --format: invalid choice: 'bogus' "
-            "(choose from 'markdown', 'git', 'html')",
+            "(choose from ",
             err.getvalue(),
         )