All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <djwong@kernel.org>, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me,
	amir73il@gmail.com, ebiggers@kernel.org
Subject: Re: [PATCH 12/13] fstests: remove test group management code
Date: Mon, 14 Jun 2021 12:39:42 -0700	[thread overview]
Message-ID: <fac2e9c2-4380-bd3b-07b1-9ab47e0c32d6@oracle.com> (raw)
In-Reply-To: <162317282778.653489.13112698258806159936.stgit@locust>



On 6/8/21 10:20 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Remove all the code that manages group files, since we now generate
> them at build time.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Ok, looks ok
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

> ---
>   tools/mvtest     |   12 ------
>   tools/sort-group |  112 ------------------------------------------------------
>   2 files changed, 124 deletions(-)
>   delete mode 100755 tools/sort-group
> 
> 
> diff --git a/tools/mvtest b/tools/mvtest
> index 572ae14e..fa967832 100755
> --- a/tools/mvtest
> +++ b/tools/mvtest
> @@ -32,24 +32,12 @@ did="$(basename "${dest}")"
>   sgroup="$(basename "$(dirname "tests/${src}")")"
>   dgroup="$(basename "$(dirname "tests/${dest}")")"
>   
> -sgroupfile="tests/${sgroup}/group"
> -dgroupfile="tests/${dgroup}/group"
> -
>   git mv "tests/${src}" "tests/${dest}"
>   git mv "tests/${src}.out" "tests/${dest}.out"
>   sed -e "s/^# FS[[:space:]]*QA.*Test.*[0-9]\+$/# FS QA Test No. ${did}/g" -i "tests/${dest}"
>   sed -e "s/^QA output created by ${sid}$/QA output created by ${did}/g" -i "tests/${dest}.out"
>   sed -e "s/test-${sid}/test-${did}/g" -i "tests/${dest}.out"
>   
> -grpline="$(grep "^${sid} " "${sgroupfile}")"
> -newgrpline="$(echo "${grpline}" | sed -e "s/^${sid} /${did} /g")"
> -
> -sed -e "/^${sid} .*$/d" -i "${sgroupfile}"
> -cp "${dgroupfile}" "${dgroupfile}.new"
> -append "${dgroupfile}.new" "${newgrpline}"
> -"${dir}/sort-group" "${dgroupfile}.new"
> -mv "${dgroupfile}.new" "${dgroupfile}"
> -
>   echo "Moved \"${src}\" to \"${dest}\"."
>   
>   exit 0
> diff --git a/tools/sort-group b/tools/sort-group
> deleted file mode 100755
> index 6fcaad77..00000000
> --- a/tools/sort-group
> +++ /dev/null
> @@ -1,112 +0,0 @@
> -#!/usr/bin/env python
> -import sys
> -
> -# Sort a group list, carefully preserving comments.
> -
> -def xfstest_key(key):
> -	'''Extract the numeric part of a test name if possible.'''
> -	k = 0
> -
> -	assert type(key) == str
> -
> -	# No test number at all...
> -	if not key[0].isdigit():
> -		return key
> -
> -	# ...otherwise extract as much number as we can.
> -	for digit in key:
> -		if digit.isdigit():
> -			k = k * 10 + int(digit)
> -		else:
> -			return k
> -	return k
> -
> -def read_group(fd):
> -	'''Read the group list, carefully attaching comments to the next test.'''
> -	tests = {}
> -	comments = None
> -
> -	for line in fd:
> -		sline = line.strip()
> -		tokens = sline.split()
> -		if len(tokens) == 0 or tokens[0] == '#':
> -			if comments == None:
> -				comments = []
> -			comments.append(sline)
> -		else:
> -			tests[tokens[0]] = (comments, tokens[1:])
> -			comments = None
> -	return tests
> -
> -def sort_keys(keys):
> -	'''Separate keys into integer and non-integer tests.'''
> -	int_keys = []
> -	int_xkeys = []
> -	str_keys = []
> -
> -	# Sort keys into integer(ish) tests and other
> -	for key in keys:
> -		xkey = xfstest_key(key)
> -		if type(xkey) == int:
> -			int_keys.append(key)
> -			int_xkeys.append(xkey)
> -		else:
> -			str_keys.append(key)
> -	return (int_keys, int_xkeys, str_keys)
> -
> -def write_sorted(tests, fd):
> -	def dump_xkey(xkey):
> -		(comments, tokens) = tests[key]
> -		if comments:
> -			for c in comments:
> -				fd.write('%s\n' % c)
> -		fd.write('%s %s\n' % (key, ' '.join(tokens)))
> -	'''Print tests (and comments) in number order.'''
> -
> -	(int_keys, ignored, str_keys) = sort_keys(tests.keys())
> -	for key in sorted(int_keys, key = xfstest_key):
> -		dump_xkey(key)
> -	for key in sorted(str_keys):
> -		dump_xkey(key)
> -
> -def sort_main():
> -	if '--help' in sys.argv[1:]:
> -		print('Usage: %s groupfiles' % sys.argv[0])
> -		sys.exit(0)
> -
> -	for arg in sys.argv[1:]:
> -		with open(arg, 'r+') as fd:
> -			x = read_group(fd)
> -			fd.seek(0, 0)
> -			write_sorted(x, fd)
> -
> -def nextid_main():
> -	if '--help' in sys.argv[1:]:
> -		print('Usage: %s group[/startid] ' % sys.argv[0])
> -		sys.exit(0)
> -
> -	if len(sys.argv) != 2:
> -		print('Specify exactly one group name.')
> -		sys.exit(1)
> -
> -	c = sys.argv[1].split('/')
> -	if len(c) > 1:
> -		startid = int(c[1])
> -	else:
> -		startid = 1
> -	group = c[0]
> -
> -	with open('tests/%s/group' % group, 'r') as fd:
> -		x = read_group(fd)
> -		xkeys = {int(x) for x in sort_keys(x.keys())[1]}
> -
> -		xid = startid
> -		while xid in xkeys:
> -			xid += 1
> -		print('%s/%03d' % (group, xid))
> -
> -if __name__ == '__main__':
> -	if 'nextid' in sys.argv[0]:
> -		nextid_main()
> -	else:
> -		sort_main()
> 

  parent reply	other threads:[~2021-06-14 19:39 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-08 17:19 [PATCHSET v1 00/13] fstests: move test group lists into test files Darrick J. Wong
2021-06-08 17:19 ` [PATCH 01/13] fstests: fix group check in new script Darrick J. Wong
2021-06-10  8:43   ` Chandan Babu R
2021-06-11 21:54     ` Allison Henderson
2021-06-08 17:19 ` [PATCH 02/13] misc: move exit status into trap handler Darrick J. Wong
2021-06-10  8:43   ` Chandan Babu R
2021-06-11 21:55   ` Allison Henderson
2021-06-08 17:19 ` [PATCH 03/13] fstests: refactor test boilerplate code Darrick J. Wong
2021-06-10  8:44   ` Chandan Babu R
2021-06-11 21:55   ` Allison Henderson
2021-06-12  0:08   ` Eric Biggers
2021-06-12  0:34     ` Darrick J. Wong
2021-06-08 17:19 ` [PATCH 04/13] fstests: add tool migrate group membership data to test files Darrick J. Wong
2021-06-10  8:44   ` Chandan Babu R
2021-06-11 21:55   ` Allison Henderson
2021-06-08 17:19 ` [PATCH 05/13] fstests: move test group info " Darrick J. Wong
2021-06-11 21:55   ` Allison Henderson
2021-06-11 23:29   ` Eric Biggers
2021-06-12  0:17     ` Eric Biggers
2021-06-12  0:34       ` Darrick J. Wong
2021-06-08 17:19 ` [PATCH 06/13] fstests: clean up open-coded golden output Darrick J. Wong
2021-06-10  8:57   ` Chandan Babu R
2021-06-11 21:55   ` Allison Henderson
2021-06-08 17:20 ` [PATCH 07/13] fstests: automatically generate group files Darrick J. Wong
2021-06-11  5:39   ` Chandan Babu R
2021-06-11 23:37   ` [PATCH v1.1 " Darrick J. Wong
2021-06-14  5:38     ` Allison Henderson
2021-06-08 17:20 ` [PATCH 08/13] fstests: convert nextid to use automatic group generation Darrick J. Wong
2021-06-11  6:31   ` Chandan Babu R
2021-06-11 23:46   ` Eric Biggers
2021-06-12  0:40     ` Darrick J. Wong
2021-06-14  5:38   ` Allison Henderson
2021-06-08 17:20 ` [PATCH 09/13] fstests: adapt the new test script to our new group tagging scheme Darrick J. Wong
2021-06-11  6:55   ` Chandan Babu R
2021-06-14  5:38   ` Allison Henderson
2021-06-08 17:20 ` [PATCH 10/13] check: use generated group files Darrick J. Wong
2021-06-11  7:49   ` Chandan Babu R
2021-06-14 19:39   ` Allison Henderson
2021-06-08 17:20 ` [PATCH 11/13] fstests: remove " Darrick J. Wong
2021-06-11  7:53   ` Chandan Babu R
2021-06-11 23:24   ` Eric Biggers
2021-06-11 23:29     ` Darrick J. Wong
2021-06-11 23:51       ` Eric Biggers
2021-06-14 19:39   ` Allison Henderson
2021-06-08 17:20 ` [PATCH 12/13] fstests: remove test group management code Darrick J. Wong
2021-06-11  8:19   ` Chandan Babu R
2021-06-14 19:39   ` Allison Henderson [this message]
2021-06-08 17:20 ` [PATCH 13/13] misc: update documentation to reflect auto-generated group files Darrick J. Wong
2021-06-11  8:23   ` Chandan Babu R
2021-06-14 19:39   ` Allison Henderson
2021-06-14 20:49     ` Darrick J. Wong
2021-06-14 20:58 [PATCHSET v2 00/13] fstests: move test group lists into test files Darrick J. Wong
2021-06-14 21:00 ` [PATCH 12/13] fstests: remove test group management code Darrick J. Wong
2021-06-16 20:58   ` Eric Biggers
2021-06-17  0:08     ` Darrick J. Wong
2021-06-21 23:10 [PATCHSET v3 00/13] fstests: move test group lists into test files Darrick J. Wong
2021-06-21 23:11 ` [PATCH 12/13] fstests: remove test group management code Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fac2e9c2-4380-bd3b-07b1-9ab47e0c32d6@oracle.com \
    --to=allison.henderson@oracle.com \
    --cc=amir73il@gmail.com \
    --cc=djwong@kernel.org \
    --cc=ebiggers@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=guan@eryu.me \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.