aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Rodriguez <victor.rodriguez.bahena@intel.com>2017-11-28 19:52:57 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2017-11-28 19:52:57 +0530
commitd5090db30edf04f39dc0eacfc09db72af8045f39 (patch)
tree7e5c47b130c1d373749e32fac50012131df7ba4f
parent0595e3603406e7f7b457bf9c99059bf1a48d97ef (diff)
downloadglibc-d5090db30edf04f39dc0eacfc09db72af8045f39.zip
glibc-d5090db30edf04f39dc0eacfc09db72af8045f39.tar.gz
glibc-d5090db30edf04f39dc0eacfc09db72af8045f39.tar.bz2
benchtests: Expand range of tests names in schema.json
When executing bench-math the benchmark output is invalid with this error msg: Invalid benchmark output: 'workload-spec2006.wrf' does not match any of the regexes: '^[_a-zA-Z0-9]*$ยน or Invalid benchmark output: Additional properties are not allowed ('workload-spec2006.wrf' was unexpected) The error was seen when running the test: workload-spec2006.wrf, 'stack=1024,guard=1' and 'stack=1024,guard=2'. The problem is that the current regex's do not accept the hyphen, dot, equal and comma in the output. This patch changes the regex in benchout.schema.json to accept symbols in benchmark tests names. ChangeLog: * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider range of tests names. Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com> Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org>
-rw-r--r--ChangeLog3
-rw-r--r--benchtests/scripts/benchout.schema.json2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21fd04a..9685aec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-11-28 Victor Rodriguez <victor.rodriguez.bahena@intel.com>
+ * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider
+ range of tests names.
+
* benchtests/scripts/benchout.schema.json: Add throughput as accepted
result from property and remove "max", min" and "mean" from
required properties based on benchtests/bench-skeleton.c.
diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json
index dfc00b1..0eca21b 100644
--- a/benchtests/scripts/benchout.schema.json
+++ b/benchtests/scripts/benchout.schema.json
@@ -13,7 +13,7 @@
"title": "Function names",
"type": "object",
"patternProperties": {
- "^[_a-zA-Z0-9]*$": {
+ "^[_a-zA-Z0-9,=.-]*$": {
"title": "Function variants",
"type": "object",
"properties": {