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>

diff --git a/ChangeLog b/ChangeLog
index 21fd04ab2176f584e36e8b2aaf7ae91b9e505cab..9685aec392d57512165e10f88277c5b2126d1893 100644 (file)
--- 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 dfc00b14757c23dd828ee39358dd6550b957dbe7..0eca21b6bd1d7fe7eeef388fbfc3831eeb0a8cec 100644 (file)
--- 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": {