| Message ID | 20171123180148.5905-1-victor.rodriguez.bahena@intel.com |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 23 November 2017 11:31 PM, Victor Rodriguez wrote: > 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> OK. Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org> > --- > ChangeLog | 5 +++++ > benchtests/scripts/benchout.schema.json | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/ChangeLog b/ChangeLog > index 64a8d9c8ea..73df200dbb 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,8 @@ > +2017-11-22 Victor Rodriguez <victor.rodriguez.bahena@intel.com> > + > + * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider > + range of tests names. > + > 2017-11-21 Mike FABIAN <mfabian@redhat.com> > > [BZ #15537] > diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json > index affb7c11f4..815ad9735a 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": { >
-----Original Message----- From: Siddhesh Poyarekar <siddhesh@gotplt.org> Date: Thursday, November 23, 2017 at 12:08 PM To: Victor Rodriguez Bahena <victor.rodriguez.bahena@intel.com>, "libc-alpha@sourceware.org" <libc-alpha@sourceware.org> Subject: Re: [PATCH V3] benchtests: Expand range of tests names in schema.json > > >On Thursday 23 November 2017 11:31 PM, Victor Rodriguez wrote: >> 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> > >OK. > >Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org> Thanks Siddhesh Are these patches ok for master ? Could you please merge them ? Regards Victor >> --- >> ChangeLog | 5 +++++ >> benchtests/scripts/benchout.schema.json | 2 +- >> 2 files changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/ChangeLog b/ChangeLog >> index 64a8d9c8ea..73df200dbb 100644 >> --- a/ChangeLog >> +++ b/ChangeLog >> @@ -1,3 +1,8 @@ >> +2017-11-22 Victor Rodriguez <victor.rodriguez.bahena@intel.com> >> + >> + * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider >> + range of tests names. >> + >> 2017-11-21 Mike FABIAN <mfabian@redhat.com> >> >> [BZ #15537] >> diff --git a/benchtests/scripts/benchout.schema.json >>b/benchtests/scripts/benchout.schema.json >> index affb7c11f4..815ad9735a 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": { >>
On Saturday 25 November 2017 02:57 AM, Rodriguez Bahena, Victor wrote: >> OK. >> >> Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org> > > Thanks Siddhesh > > Are these patches ok for master ? Could you please merge them ? I've pushed these now. Please make sure you don't have the ChangeLog diff in the patch since it almost always conflicts and fails to apply cleanly. Siddhesh
-----Original Message----- From: Siddhesh Poyarekar <siddhesh@gotplt.org> Date: Tuesday, November 28, 2017 at 8:40 AM To: Victor Rodriguez Bahena <victor.rodriguez.bahena@intel.com>, "libc-alpha@sourceware.org" <libc-alpha@sourceware.org> Subject: Re: [PATCH V3] benchtests: Expand range of tests names in schema.json >On Saturday 25 November 2017 02:57 AM, Rodriguez Bahena, Victor wrote: >>> OK. >>> >>> Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org> >> >> Thanks Siddhesh >> >> Are these patches ok for master ? Could you please merge them ? > >I've pushed these now. Please make sure you don't have the ChangeLog >diff in the patch since it almost always conflicts and fails to apply >cleanly. > >Siddhesh Thanks a lot , sorry for that won¹t happen again :) >
diff --git a/ChangeLog b/ChangeLog index 64a8d9c8ea..73df200dbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-11-22 Victor Rodriguez <victor.rodriguez.bahena@intel.com> + + * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider + range of tests names. + 2017-11-21 Mike FABIAN <mfabian@redhat.com> [BZ #15537] diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json index affb7c11f4..815ad9735a 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": {
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> --- ChangeLog | 5 +++++ benchtests/scripts/benchout.schema.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)