From patchwork Mon Jun 14 20:59:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12319979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DFD5C2B9F4 for ; Mon, 14 Jun 2021 20:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39671613B3 for ; Mon, 14 Jun 2021 20:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234916AbhFNVBZ (ORCPT ); Mon, 14 Jun 2021 17:01:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:48346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234280AbhFNVBY (ORCPT ); Mon, 14 Jun 2021 17:01:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9460B6120E; Mon, 14 Jun 2021 20:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623704361; bh=1qGxojjudgkcS96901nANP3McP9ax+pZ+vC58TlYgIk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=qjHF2xZpf+80DzYmn8RX/H33GLwvEeM8/GTW/XFOTrcuXi+i2zp7Wg56MxF8AwVZs Z5HVhc07PbCsxv07UxXfp/ZC3fJ4DncE8Ufy11T4GZhIegiX7lUkD3lArWkd+irmAC ha/JPtKGFJdp+t/8XKY40Ffcc1gUKF0ubNSEltCYb5SDjuumqxBwyIIStvvnpWsHU+ bmq86L4pMP9JYWPrsD/KkTBbhrq1bkWgHNjkKSPgFe8RddgJ89DcfqUldzwGpXdSGl Xf+Riu3s0y0TLuafqicI9DdB+GTgjtBCIVauFbjJw2HzLgDinUaOXvZ7bMImy3WX11 IiLnTiK5bIOYg== Subject: [PATCH 04/13] fstests: add tool migrate group membership data to test files From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: Chandan Babu R , Allison Henderson , linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me, amir73il@gmail.com, ebiggers@kernel.org Date: Mon, 14 Jun 2021 13:59:21 -0700 Message-ID: <162370436132.3800603.3564234435790687757.stgit@locust> In-Reply-To: <162370433910.3800603.9623820748404628250.stgit@locust> References: <162370433910.3800603.9623820748404628250.stgit@locust> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Create a tool to migrate the mapping of tests <-> groups out of the group file and into the individual test file as a _begin_fstest call. In the next patches we'll rewrite all the test files and auto generate the group files from the tests. Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R Reviewed-by: Allison Henderson Reviewed-by: Christoph Hellwig --- tools/convert-group | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100755 tools/convert-group diff --git a/tools/convert-group b/tools/convert-group new file mode 100755 index 00000000..81ad9934 --- /dev/null +++ b/tools/convert-group @@ -0,0 +1,138 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2021 Oracle. All Rights Reserved. + +# Move group tags from the groups file into the test files themselves. + +if [ -z "$1" ] || [ "$1" = "--help" ]; then + echo "Usage: $0 test_dir [test_dirs...]" + exit 1 +fi + +obliterate_group_file() { + sed -e 's/^#.*$//g' < group | while read test groups; do + if [ -z "$test" ]; then + continue; + elif [ ! -e "$test" ]; then + echo "Ignoring unknown test file \"$test\"." + continue + fi + + # Replace all the open-coded test preparation code with a + # single call to _begin_fstest. + sed -e '/^seqres=\$RESULT_DIR\/\$seq$/d' \ + -e '/^seqres=\"\$RESULT_DIR\/\$seq\"$/d' \ + -e '/^echo "QA output created by \$seq"$/d' \ + -e '/^here=`pwd`$/d' \ + -e '/^here=\$(pwd)$/d' \ + -e '/^here=\$PWD$/d' \ + -e '/^here=\"`pwd`\"$/d' \ + -e '/^tmp=\/tmp\/\$\$$/d' \ + -e '/^status=1.*failure.*is.*the.*default/d' \ + -e '/^status=1.*FAILure.*is.*the.*default/d' \ + -e '/^status=1.*success.*is.*the.*default/d' \ + -e '/^status=1.*default.*failure/d' \ + -e '/^echo.*QA output created by.*seq/d' \ + -e '/^# remove previous \$seqres.full before test/d' \ + -e '/^rm -f \$seqres.full/d' \ + -e 's|^# get standard environment, filters and checks|# Import common functions.|g' \ + -e '/^\. \.\/common\/rc/d' \ + -e '/^\. common\/rc/d' \ + -e 's|^seq=.*$|. ./common/preamble\n_begin_fstest '"$groups"'|g' \ + -i "$test" + + # Replace the open-coded trap calls that register cleanup code + # with a call to _register_cleanup. + # + # For tests that registered empty-string cleanups or open-coded + # calls to remove $tmp files, remove the _register_cleanup + # calls entirely because the default _cleanup does that for us. + # + # For tests that now have a _register_cleanup call for the + # _cleanup function, remove the explicit call because + # _begin_fstest already registers that for us. + # + # For tests that override _cleanup, insert a comment noting + # that it is overriding the default, to match the ./new + # template. + sed -e 's|^trap "exit \\\$status" 0 1 2 3 15|_register_cleanup ""|g' \ + -e 's|^trap "\(.*\)[[:space:]]*; exit \\\$status" 0 1 2 3 15|_register_cleanup "\1"|g' \ + -e 's|^trap "\(.*\)[[:space:]]*; exit \\\$status" 1 2 3 15|_register_cleanup "\1"|g' \ + -e 's|^trap '"'"'\(.*\)[[:space:]]*; exit \$status'"'"' 0 1 2 3 15|_register_cleanup "\1"|g' \ + -e 's|^trap "\(.*\)[[:space:]]*; exit \\\$status" 0 1 2 3 7 15|_register_cleanup "\1" BUS|g' \ + -e 's|^_register_cleanup "[[:space:]]*\([^[:space:]]*\)[[:space:]]*"|_register_cleanup "\1"|g' \ + -e '/^_register_cleanup ""$/d' \ + -e '/^_register_cleanup "rm -f \$tmp.*"$/d' \ + -e '/^_register_cleanup "_cleanup"$/d' \ + -e 's|^_cleanup()|# Override the default cleanup function.\n_cleanup()|g' \ + -i "$test" + + # If the test doesn't import any common functionality, + # get rid of the pointless comment. + if ! grep -q '^\. .*common' "$test"; then + sed -e '/^# Import common functions.$/d' -i "$test" + fi + + # Replace the "status=1" lines that don't have the usual + # "failure is the default" message if there's no other code + # between _begin_fstest and status=1. + if grep -q '^status=1$' "$test"; then + awk ' +BEGIN { + saw_groupinfo = 0; +} +{ + if ($0 ~ /^_begin_fstest/) { + saw_groupinfo = 1; + printf("%s\n", $0); + } else if ($0 ~ /^status=1$/) { + if (saw_groupinfo == 0) { + printf("%s\n", $0); + } + } else if ($0 == "") { + printf("\n"); + } else { + saw_groupinfo = 0; + printf("%s\n", $0); + } +} +' < "$test" > "$test.new" + cat "$test.new" > "$test" + rm -f "$test.new" + fi + + # Get rid of _cleanup functions that match the standard one. + # Thanks to Eric Biggers for providing this. + sed -z -E \ + -e 's/(#[^#\n]*\n)*_cleanup\(\)\n\{\n(\s+cd \/\n)?\s+rm -r?f "?\$tmp"?\.\*\n\}\n\n?//' \ + -e 's/(#[^#\n]*\n)*_cleanup\(\)\n\{\n(\s+cd \/\n)?\s+rm -fr "?\$tmp"?\.\*\n\}\n\n?//' \ + -i "$test" + + # Collapse sequences of blank lines to a single blank line. + awk ' +BEGIN { + saw_blank = 0; +} +{ + if ($0 ~ /^$/) { + if (saw_blank == 0) { + printf("\n"); + saw_blank = 1; + } + } else { + printf("%s\n", $0); + saw_blank = 0; + } +} +' < "$test" > "$test.new" + cat "$test.new" > "$test" + rm -f "$test.new" + done +} + +curr_dir="$PWD" +for tdir in "$@"; do + cd "tests/$tdir" + obliterate_group_file + cd "$curr_dir" +done