From patchwork Tue Nov 21 18:04:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Rodriguez Bahena, Victor" X-Patchwork-Id: 840146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-87374-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="EHFwMEX5"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yhD7B68vZz9sCZ for ; Wed, 22 Nov 2017 05:06:46 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=T5qvIUh7uhdvGIqO4F5xhwC2u43E5DpgjQwsnC52/4bX2c+h6El9+ 8hHC3JCFqkMqo1S4NIgzEY+/OFcOaYWAYAGb6RoV9zFlyneLH4TlLNwTkkpAzTOs MYQN3+BmHkB+bVucXK6+A5Vnre7Ta6vPoIoMy5dZ2kTpCGzyawvA2Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=mGVYmF7gNsc2rd+AjxifbD1cHPA=; b=EHFwMEX51OkEsxfUpKaSXsUL8OR5 aaN1DgkNP9eKfBukIyXDmEm5RiSpx4SQS8RQ7pNyCUDigqF1A/oYOi4+SxQNQYJN KczigZFmiEZCcPXL7B6Y29bQ9gZ4YoMcYqewwISt2I+y76s1r0WgzH2tZ3aYqg0+ hisyKT1Zzlt8aUk= Received: (qmail 93020 invoked by alias); 21 Nov 2017 18:06:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 92661 invoked by uid 89); 21 Nov 2017 18:06:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, SPF_PASS autolearn=ham version=3.3.2 spammy=RELEASE, HContent-Transfer-Encoding:8bit X-HELO: mga04.intel.com X-ExtLoop1: 1 From: Victor Rodriguez To: libc-alpha@sourceware.org Cc: Victor Rodriguez Subject: [PATCH V2] benchtests: Expand range of tests names in schema.json Date: Tue, 21 Nov 2017 18:04:16 +0000 Message-Id: <20171121180416.28857-1-victor.rodriguez.bahena@intel.com> MIME-Version: 1.0 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) This patch changes regex in benchout.schema.json to accept symbols in benchmark tests names. This patch came after error running workload-spec2006.wrf, that detects an error in validation script, which does not expected the hyphen and the dot. Other commond symbols like: "," and "=" are added to prevent future errors. (VERSION): Set to 2.27 * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider range of tests names. Signed-off-by: Victor Rodriguez --- ChangeLog | 6 ++++++ benchtests/scripts/benchout.schema.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8dbfc7e..f29d180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-11-15 Victor Rodriguez + + (VERSION): Set to 2.27 + * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider range + of tests names. + 2017-08-02 Siddhesh Poyarekar * version.h (RELEASE): Set to "stable" diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json index affb7c1..815ad97 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": {