[PATCHSET 0/1] fstests: fixes for test control code

[PATCHSET 0/1] fstests: fixes for test control code

[Darrick J. Wong]

Hi all,

Here is one more fix for problems in fstests itself, which teaches ./new
to take a new test number when creating a test.  Most people will want
it to pick one, but for those who want to create a large number of tests
now that are numbered high enough to avoid conflicts with future
rebases, this feature is for you!

If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.

This is an extraordinary way to destroy everything.  Enjoy!
Comments and questions are, as always, welcome.

--D

fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=fstests-fixes
---
 new |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

[PATCH 1/1] new: allow users to specify a new test id

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

Alter the ./new script so that one can set the test id explicitly.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 new |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)


diff --git a/new b/new
index 07144399..51111f08 100755
--- a/new
+++ b/new
@@ -26,7 +26,18 @@ usage()
 }
 
 [ $# -eq 0 ] && usage
-tdir=tests/$1
+
+if echo "$1" | grep -q '/'; then
+	if [ -e "tests/$1" ]; then
+		echo "$1: test already exists."
+		exit 1
+	fi
+	tdir="tests/$(echo "$1" | cut -d '/' -f 1)"
+	id="$(echo "$1" | cut -d '/' -f 2)"
+else
+	tdir=tests/$1
+	id="$(basename "$(./tools/nextid "$1")")"
+fi
 
 i=0
 line=0
@@ -36,7 +47,6 @@ eof=1
 export AWK_PROG="$(type -P awk)"
 [ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; }
 
-id="$(basename "$(./tools/nextid "$1")")"
 echo "Next test id is $id"
 shift
 

Re: [PATCH 1/1] new: allow users to specify a new test id

[Eryu Guan]

On Tue, Jul 06, 2021 at 05:21:04PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Alter the ./new script so that one can set the test id explicitly.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>

Looks good to me. Mind updating the usage info as well?

Thanks,
Eryu

> ---
>  new |   14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/new b/new
> index 07144399..51111f08 100755
> --- a/new
> +++ b/new
> @@ -26,7 +26,18 @@ usage()
>  }
>  
>  [ $# -eq 0 ] && usage
> -tdir=tests/$1
> +
> +if echo "$1" | grep -q '/'; then
> +	if [ -e "tests/$1" ]; then
> +		echo "$1: test already exists."
> +		exit 1
> +	fi
> +	tdir="tests/$(echo "$1" | cut -d '/' -f 1)"
> +	id="$(echo "$1" | cut -d '/' -f 2)"
> +else
> +	tdir=tests/$1
> +	id="$(basename "$(./tools/nextid "$1")")"
> +fi
>  
>  i=0
>  line=0
> @@ -36,7 +47,6 @@ eof=1
>  export AWK_PROG="$(type -P awk)"
>  [ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; }
>  
> -id="$(basename "$(./tools/nextid "$1")")"
>  echo "Next test id is $id"
>  shift
>  

Re: [PATCH 1/1] new: allow users to specify a new test id

[Darrick J. Wong]

On Sun, Jul 18, 2021 at 09:57:14PM +0800, Eryu Guan wrote:
> On Tue, Jul 06, 2021 at 05:21:04PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> > 
> > Alter the ./new script so that one can set the test id explicitly.
> > 
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> 
> Looks good to me. Mind updating the usage info as well?

Will do and resubmit.  Thanks for reviewing the rest of the patches. :)

--D

> 
> Thanks,
> Eryu
> 
> > ---
> >  new |   14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> > 
> > 
> > diff --git a/new b/new
> > index 07144399..51111f08 100755
> > --- a/new
> > +++ b/new
> > @@ -26,7 +26,18 @@ usage()
> >  }
> >  
> >  [ $# -eq 0 ] && usage
> > -tdir=tests/$1
> > +
> > +if echo "$1" | grep -q '/'; then
> > +	if [ -e "tests/$1" ]; then
> > +		echo "$1: test already exists."
> > +		exit 1
> > +	fi
> > +	tdir="tests/$(echo "$1" | cut -d '/' -f 1)"
> > +	id="$(echo "$1" | cut -d '/' -f 2)"
> > +else
> > +	tdir=tests/$1
> > +	id="$(basename "$(./tools/nextid "$1")")"
> > +fi
> >  
> >  i=0
> >  line=0
> > @@ -36,7 +47,6 @@ eof=1
> >  export AWK_PROG="$(type -P awk)"
> >  [ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; }
> >  
> > -id="$(basename "$(./tools/nextid "$1")")"
> >  echo "Next test id is $id"
> >  shift
> >  

Re: [PATCH 1/1] new: allow users to specify a new test id

[Christoph Hellwig]

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

[PATCH 1/1] new: allow users to specify a new test id

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

Alter the ./new script so that one can set the test id explicitly.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 new |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)


diff --git a/new b/new
index 07144399..2097a883 100755
--- a/new
+++ b/new
@@ -20,13 +20,24 @@ _cleanup()
 SRC_GROUPS=`find tests -not -path tests -type d -printf "%f "`
 usage()
 {
-    echo "Usage $0 test_dir"
+    echo "Usage $0 test_dir|test_dir_and_name"
     echo "Available dirs are: $SRC_GROUPS"
     exit
 }
 
 [ $# -eq 0 ] && usage
-tdir=tests/$1
+
+if echo "$1" | grep -q '/'; then
+	if [ -e "tests/$1" ]; then
+		echo "$1: test already exists."
+		exit 1
+	fi
+	tdir="tests/$(echo "$1" | cut -d '/' -f 1)"
+	id="$(echo "$1" | cut -d '/' -f 2)"
+else
+	tdir=tests/$1
+	id="$(basename "$(./tools/nextid "$1")")"
+fi
 
 i=0
 line=0
@@ -36,7 +47,6 @@ eof=1
 export AWK_PROG="$(type -P awk)"
 [ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; }
 
-id="$(basename "$(./tools/nextid "$1")")"
 echo "Next test id is $id"
 shift