From patchwork Sun Feb 12 23:29:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9568639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CE25160572 for ; Sun, 12 Feb 2017 23:29:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C33A3280FC for ; Sun, 12 Feb 2017 23:29:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B825628113; Sun, 12 Feb 2017 23:29:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55756280FC for ; Sun, 12 Feb 2017 23:29:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751168AbdBLX3V (ORCPT ); Sun, 12 Feb 2017 18:29:21 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34516 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbdBLX3U (ORCPT ); Sun, 12 Feb 2017 18:29:20 -0500 Received: by mail-wm0-f66.google.com with SMTP id c85so16482352wmi.1 for ; Sun, 12 Feb 2017 15:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q8NALX4FsWD48qnZOB42V8S0sQBWAq02r7ZOfJDQvzY=; b=mMqWDRGS0U8Glu/KcOfFpIICaU4KLv7WrqV90MfXWdtRbLI51U7dh0gyDx9bAm9vrQ 3wAxWuWQWesAiH+8k9rOadscJous33kYvnSu0rCuf2LSw9CWI0bXDsHaUs4swqFkft3v rlZrSn1w4eYnygcz41ymI0UvABnsAE7UfFUF4Jg8UBbSE7q/LYwwvLSZ7cQKEEcwN3ki hBA2+IWaKhJVRyvW/eGV3doW76hVYzILjZghlQK5UYizF0FZ0qpNMcg7f2JrSbised2E BtwRZ+8KPcVtJlJXu8dPNUkkjID+upt7Ubp9smkK/8CJ7njN9rBCLW2dD7poOi7byysm Lf2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q8NALX4FsWD48qnZOB42V8S0sQBWAq02r7ZOfJDQvzY=; b=uBIqyTm9RdUwOANxHuTq0sUHMmHDvWDAa+jVF9NNzv6GLOwVoOsrj4+uyDBgqV1rxX hDcKmlgEqOmJE1+NqLcMrWcIXhPn1CafdqNC+S4WwhIljmaXXi2wGIjWW6CF6Do1m0yw uOMo2VD6RQoygt030KV6sspIbQgahQUgGrLt2Vw5bzF25njvxele2MVksnFkTx3mWVXx ugT2R2bhRUveEq9RnY0sIhg9rqcKkiZbxg+FEV96Cu4blN5zJx+3KrQIj1LAoKLYpa3i PoM2cW9FYqSwVFGfNDqYq+dPict37uv2Ry1XPV7ymkyYcXk/PEctwGgN7Hii4TKCmGIj DCZg== X-Gm-Message-State: AMke39n2IU7sDU5xvVdDpPQLXty3Z32MDrG6de3faAuNqKpUs4yNXSfL3B992SAWmRFuLA== X-Received: by 10.28.61.84 with SMTP id k81mr34262216wma.27.1486942159165; Sun, 12 Feb 2017 15:29:19 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:870:3e00:1cde:6e8b:d488:2b72]) by smtp.gmail.com with ESMTPSA id 45sm8440605wrx.60.2017.02.12.15.29.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Feb 2017 15:29:18 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v2 10/14] testsuite: check the nbr of times a pattern should be present Date: Mon, 13 Feb 2017 00:29:00 +0100 Message-Id: <20170212232904.49647-11-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170212232904.49647-1-luc.vanoostenryck@gmail.com> References: <20170208222805.c77ilwchxpg2vnx4@macpro.local> <20170212232904.49647-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Complement the 'check-output-contains/excludes' tags to also be able to specify the number of times a given pattern should occurs in the output. Signed-off-by: Luc Van Oostenryck --- Documentation/test-suite | 4 ++++ validation/test-suite | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Documentation/test-suite b/Documentation/test-suite index a0f205f43..2e786bbf3 100644 --- a/Documentation/test-suite +++ b/Documentation/test-suite @@ -49,6 +49,10 @@ check-output-excludes: (optional) Several such tags can be given, in which case the output must contains none of the patterns. +check-output-pattern--times: (optional) + Similar than the contains/excludes her above, but with full control + of the number of times the pattern should occurs in the output. + Using test-suite ~~~~~~~~~~~~~~~~ diff --git a/validation/test-suite b/validation/test-suite index e5317109d..c14a4c5ab 100755 --- a/validation/test-suite +++ b/validation/test-suite @@ -93,6 +93,27 @@ has_none_patterns() has_patterns "$1" "$2" "$3" -eq } +## +# nbr_patterns(ifile tag ofile) - does ofile contains the +# the patterns given by ifile's tags +# the right number of time? +nbr_patterns() +{ + ifile="$1" + patt="$2" + ofile="$3" + grep "$patt-[0-9][0-9]*-times:" "$ifile" | \ + sed -e "s/^.*$patt-\([0-9][0-9]*\)-times: *\(.*\)/\1 \2/" | \ + while read nbr pat; do + n=$(grep -s "$pat" "$ofile" | wc -l) + if [ "$n" -ne "$nbr" ]; then + return 1 + fi + done + + return $? +} + ## # verbose(string) - prints string if we are in verbose mode verbose() @@ -221,6 +242,13 @@ do_test() test_failed=1 fi + # verify the 'check-output-pattern-X-times' tags + nbr_patterns "$file" 'check-output-pattern' $file.output.got + if [ "$?" -ne "0" ]; then + error "Actual output doesn't contain the pattern the expected number." + test_failed=1 + fi + get_tag "check-known-to-fail" $file must_fail=`expr "$?" = 0` known_ko_tests=`expr $known_ko_tests + $must_fail`