From patchwork Fri Dec 8 13:14:43 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: 10102503 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 6913860329 for ; Fri, 8 Dec 2017 13:15:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57B9A28B12 for ; Fri, 8 Dec 2017 13:15:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CD4428B4D; Fri, 8 Dec 2017 13:15:16 +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 F12C328B12 for ; Fri, 8 Dec 2017 13:15:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753410AbdLHNPP (ORCPT ); Fri, 8 Dec 2017 08:15:15 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:40529 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989AbdLHNPO (ORCPT ); Fri, 8 Dec 2017 08:15:14 -0500 Received: by mail-wm0-f67.google.com with SMTP id f206so3123285wmf.5 for ; Fri, 08 Dec 2017 05:15:14 -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=j7EBxrKV3/xUvAs78BUTiVTZLtZkQHWfsf8hannpGRU=; b=sCoWtfPBWCBGlmAB1SGR5DiyLzT5Aem2OAWibh818VnLctnHFOSKXdJZ4F8sG4rFnv ItrQWTfErBGb3754nfdxI93P67GGwCIHaTaxhwvYrCKF8SSHYmoKaxn2IKVm0vHpRqjQ AwVZN/89UvBRSMu0INQhMcN7fcdLLUKWfmCuCnmmhUvzoklKXRXx1ITCF8+pCbtqBzBF 3d8sgZ5T57ZKwib+JVA7lkidIPA85IoSXx94/dKX++IFarnuz1qEYVsauK03BGDqMuBc WCr6iWNIDdzPNf/LsCtNXXdJTMTv/7Bc2gW28JVIoYY0KI6mMiGNKRErH6S/8pAC3F8y 2Wsg== 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=j7EBxrKV3/xUvAs78BUTiVTZLtZkQHWfsf8hannpGRU=; b=Qsnd47Pj774ArroFWKGX++PcoqpOQx+p255xVyc+pMMGtYGIQR0pYPrrELr7PwYsqk N62L5NghGWxpmd/KNGpsyd6MV5/EfjZ7hjuIzE51Sf8GgAS5kg77bJz6nRuxPWzAjkH3 gz2E0ZVdX+qQjz9wjMDeNNOrBTrs5caMA8QN8xIzX0rycwZUqcRY4K+owQuvofAhUEFp AldRPl3mLOr5ZhcT2PbXH1vrYNUAML23iVD2fCpJ/h5LczEFX4WL5PfZO580oPY8sHFm qJmtNxtvc4KFVbCQ4hTXuXbE4XujfK6GBWuxYIMy6mJFBO5qWkirG1kHcCna1NpBZeIK VEIg== X-Gm-Message-State: AJaThX4EnFKtSVZJBjODarXz4ilpAO5poSAfvNQWz4xx4tgPmWFvKgPA CzaNcUQZ5pBCbgGXSk4qJfLp9Qnu X-Google-Smtp-Source: AGs4zMZAgyhqvzfHFV3mZC3Fq8UbrA83dddpBPkGpc3cplRaDvYLsAiRa2kI8YEzsOJ16g7V6CgJzw== X-Received: by 10.80.177.1 with SMTP id k1mr50257080edd.41.1512738913457; Fri, 08 Dec 2017 05:15:13 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:40a3:e300:5133:5b97:d977:9274]) by smtp.gmail.com with ESMTPSA id r8sm3148851edm.22.2017.12.08.05.15.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 05:15:12 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 04/16] testsuite: remove old ugly pattern syntax Date: Fri, 8 Dec 2017 14:14:43 +0100 Message-Id: <20171208131455.7786-5-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171208131455.7786-1-luc.vanoostenryck@gmail.com> References: <20171208131455.7786-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 It was too ugly (and a bit longish). Remove it. Signed-off-by: Luc Van Oostenryck --- validation/test-suite | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/validation/test-suite b/validation/test-suite index 903a2b908..07d9e7fc9 100755 --- a/validation/test-suite +++ b/validation/test-suite @@ -55,7 +55,6 @@ get_tag_value() check_output_ignore=0 check_output_contains=0 check_output_excludes=0 - check_output_pattern_obsolete=0 check_output_pattern=0 check_arch_ignore="" check_arch_only="" @@ -77,7 +76,6 @@ get_tag_value() check-output-ignore) check_output_ignore=1 ;; check-output-contains:) check_output_contains=1 ;; check-output-excludes:) check_output_excludes=1 ;; - check-output-pattern-) check_output_pattern_obsolete=1 ;; check-output-pattern) check_output_pattern=1 ;; check-arch-ignore:) arch=$(uname -m) check_arch_ignore="$val" ;; @@ -149,29 +147,6 @@ has_none_patterns() has_patterns "$1" "$2" "$4" -eq "$3" } -## -# 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 - error "test '$ifile' failed" - error " Pattern '$pat' expected $nbr times but got $n times" - return 1 - fi - done - - return $? -} - ## # minmax_patterns(ifile tag ofile) - does ofile contains the # the patterns given by ifile's tags @@ -371,13 +346,6 @@ do_test() test_failed=1 fi fi - if [ $check_output_pattern_obsolete -eq 1 ]; then - # verify the 'check-output-pattern-X-times' tags - nbr_patterns "$file" 'check-output-pattern' $file.output.got - if [ "$?" -ne "0" ]; then - test_failed=1 - fi - fi if [ $check_output_pattern -eq 1 ]; then # verify the 'check-output-pattern(...)' tags minmax_patterns "$file" 'check-output-pattern' $file.output.got