[PATCH 0/4] Move test cased from shared to generic

[PATCH 0/4] Move test cased from shared to generic

[David Sterba]

Hi,

as discussed recently, the tests in shared should be in generic.

Based on branch patches-in-queue, commit e098483c662d8f0b7583edca1501d8addd3b7549.

David Sterba (4):
  Move shared/298 to generic/740
  Move shared/002 to generic/745
  Move shared/298 to generic/746
  Remove rest of shared/

 check                                     |  2 +-
 tests/{shared/032 => generic/740}         |  2 +-
 tests/{shared/032.out => generic/740.out} |  0
 tests/{shared/002 => generic/745}         |  2 +-
 tests/{shared/002.out => generic/745.out} |  0
 tests/{shared/298 => generic/746}         |  2 +-
 tests/{shared/298.out => generic/746.out} |  0
 tests/shared/Makefile                     | 24 -----------------------
 8 files changed, 4 insertions(+), 28 deletions(-)
 rename tests/{shared/032 => generic/740} (99%)
 rename tests/{shared/032.out => generic/740.out} (100%)
 rename tests/{shared/002 => generic/745} (99%)
 rename tests/{shared/002.out => generic/745.out} (100%)
 rename tests/{shared/298 => generic/746} (99%)
 rename tests/{shared/298.out => generic/746.out} (100%)
 delete mode 100644 tests/shared/Makefile

-- 
2.44.0

[PATCH 1/4] Move shared/032 to generic/740

[David Sterba]

The shared/ directory was supposed to host tests that apply to a subset
of all supported filesystems but this is not utilized much and creates a
split from the generic tests. Move the test to generic.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 tests/{shared/032 => generic/740}         | 2 +-
 tests/{shared/032.out => generic/740.out} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/{shared/032 => generic/740} (99%)
 rename tests/{shared/032.out => generic/740.out} (100%)

diff --git a/tests/shared/032 b/tests/generic/740
similarity index 99%
rename from tests/shared/032
rename to tests/generic/740
index 131323ab5b0ff8..6ed248617eaa6b 100755
--- a/tests/shared/032
+++ b/tests/generic/740
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 #
-# FS QA Test No. 032
+# FS QA Test No. 740
 #
 # cross check mkfs detection of foreign filesystems
 #
diff --git a/tests/shared/032.out b/tests/generic/740.out
similarity index 100%
rename from tests/shared/032.out
rename to tests/generic/740.out
-- 
2.44.0

Re: [PATCH 1/4] Move shared/032 to generic/740

[Darrick J. Wong]

On Tue, May 07, 2024 at 09:07:36PM +0200, David Sterba wrote:
> The shared/ directory was supposed to host tests that apply to a subset
> of all supported filesystems but this is not utilized much and creates a
> split from the generic tests. Move the test to generic.
> 
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
>  tests/{shared/032 => generic/740}         | 2 +-
>  tests/{shared/032.out => generic/740.out} | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename tests/{shared/032 => generic/740} (99%)
>  rename tests/{shared/032.out => generic/740.out} (100%)
> 
> diff --git a/tests/shared/032 b/tests/generic/740
> similarity index 99%
> rename from tests/shared/032
> rename to tests/generic/740
> index 131323ab5b0ff8..6ed248617eaa6b 100755
> --- a/tests/shared/032
> +++ b/tests/generic/740
> @@ -2,7 +2,7 @@
>  # SPDX-License-Identifier: GPL-2.0
>  # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
>  #
> -# FS QA Test No. 032
> +# FS QA Test No. 740
>  #
>  # cross check mkfs detection of foreign filesystems
>  #
> diff --git a/tests/shared/032.out b/tests/generic/740.out
> similarity index 100%
> rename from tests/shared/032.out
> rename to tests/generic/740.out

Don't you need to update the "QA output created by 032" in 032.out as
well?

tools/mvtest handles at least the simple cases.

--D

> -- 
> 2.44.0
> 
> 

Re: [PATCH 1/4] Move shared/032 to generic/740

[Christoph Hellwig]

On Tue, May 07, 2024 at 09:07:36PM +0200, David Sterba wrote:
> The shared/ directory was supposed to host tests that apply to a subset
> of all supported filesystems but this is not utilized much and creates a
> split from the generic tests. Move the test to generic.

While we're at it, can we please have a

_have_mkfs_overwrite detetion instead of hardcoding ext4 and btrfs
with another check for that is supported for btrfs?

I'm also pretty sure at least ext4 supports overwrite detection as
well..

Re: [PATCH 1/4] Move shared/032 to generic/740

[Zorro Lang]

On Wed, May 08, 2024 at 10:40:07PM -0700, Christoph Hellwig wrote:
> On Tue, May 07, 2024 at 09:07:36PM +0200, David Sterba wrote:
> > The shared/ directory was supposed to host tests that apply to a subset
> > of all supported filesystems but this is not utilized much and creates a
> > split from the generic tests. Move the test to generic.
> 
> While we're at it, can we please have a
> 
> _have_mkfs_overwrite detetion instead of hardcoding ext4 and btrfs
> with another check for that is supported for btrfs?
> 
> I'm also pretty sure at least ext4 supports overwrite detection as
> well..

Yeah, that's the reason I still keep the shared as a "prefix directory"
of generic. The hardcode whitelist or blacklist of _supported_fs is a
bit rude. If a fs isn't supported by a test case totally, that's fine.
But if the condition of _notrun can be smaller and more precise (refer
to some _require_xxx helpers) that would be great.

Of course we can move shared to generic at first, then improve it later.
But I doubt if we can keep that in mind, due to there're hundreds of
generic cases :)

Thanks,
Zorro

> 
> 

Re: [PATCH 1/4] Move shared/032 to generic/740

[Christoph Hellwig]

On Thu, May 09, 2024 at 06:00:16PM +0800, Zorro Lang wrote:
> Yeah, that's the reason I still keep the shared as a "prefix directory"
> of generic. The hardcode whitelist or blacklist of _supported_fs is a
> bit rude. If a fs isn't supported by a test case totally, that's fine.
> But if the condition of _notrun can be smaller and more precise (refer
> to some _require_xxx helpers) that would be great.
> 
> Of course we can move shared to generic at first, then improve it later.
> But I doubt if we can keep that in mind, due to there're hundreds of
> generic cases :)

# git-grep _supported_fs tests/generic/ | grep -v generic

will do the job.  But before this turns into an endless discussion
I can just sign up for adding the proper helpers after the merge
is applied.

[PATCH 2/4] Move shared/002 to generic/745

[David Sterba]

The shared/ directory was supposed to host tests that apply to a subset
of all supported filesystems but this is not utilized much and creates a
split from the generic tests. Move the test to generic.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 tests/{shared/002 => generic/745}         | 2 +-
 tests/{shared/002.out => generic/745.out} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/{shared/002 => generic/745} (99%)
 rename tests/{shared/002.out => generic/745.out} (100%)

diff --git a/tests/shared/002 b/tests/generic/745
similarity index 99%
rename from tests/shared/002
rename to tests/generic/745
index d99539c91907b5..0f47f9c69ef40a 100755
--- a/tests/shared/002
+++ b/tests/generic/745
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2015 SUSE Linux Products GmbH. All Rights Reserved.
 #
-# FS QA Test No. 002
+# FS QA Test No. 745
 #
 # Test that after syncing the filesystem, adding many xattrs to a file, syncing
 # the filesystem again, writing to the file and then doing a fsync against that
diff --git a/tests/shared/002.out b/tests/generic/745.out
similarity index 100%
rename from tests/shared/002.out
rename to tests/generic/745.out
-- 
2.44.0

Re: [PATCH 2/4] Move shared/002 to generic/745

[Christoph Hellwig]

Same comment as last time - please add a common helper to check
one. e.g. a max_xattr_values or max_xattr_space helper.

Re: [PATCH 2/4] Move shared/002 to generic/745

[David Sterba]

On Wed, May 08, 2024 at 10:40:59PM -0700, Christoph Hellwig wrote:
> Same comment as last time - please add a common helper to check
> one. e.g. a max_xattr_values or max_xattr_space helper.

I agree that adding the feature checks is the right way but I want to
keep minimal changes when files get moved.

[PATCH 3/4] Move shared/298 to generic/746

[David Sterba]

The shared/ directory was supposed to host tests that apply to a subset
of all supported filesystems but this is not utilized much and creates a
split from the generic tests. Move the test to generic.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 tests/{shared/298 => generic/746}         | 2 +-
 tests/{shared/298.out => generic/746.out} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/{shared/298 => generic/746} (99%)
 rename tests/{shared/298.out => generic/746.out} (100%)

diff --git a/tests/shared/298 b/tests/generic/746
similarity index 99%
rename from tests/shared/298
rename to tests/generic/746
index 1d4e8d943bdaa6..0e6387fe4d5ece 100755
--- a/tests/shared/298
+++ b/tests/generic/746
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2013 Red Hat, Inc., Tomas Racek <tracek@redhat.com>
 #
-# FS QA Test No. 298
+# FS QA Test No. 746
 #
 # Test that filesystem sends discard requests only on free blocks
 #
diff --git a/tests/shared/298.out b/tests/generic/746.out
similarity index 100%
rename from tests/shared/298.out
rename to tests/generic/746.out
-- 
2.44.0

Re: [PATCH 3/4] Move shared/298 to generic/746

[Christoph Hellwig]

On Tue, May 07, 2024 at 09:07:45PM +0200, David Sterba wrote:
> The shared/ directory was supposed to host tests that apply to a subset
> of all supported filesystems but this is not utilized much and creates a
> split from the generic tests. Move the test to generic.

Similar thing here.  This should probably move get_free_sectors to
common code and then just do a dummy run of it to see if things
are supported.

[PATCH 4/4] Remove rest of shared/

[David Sterba]

All tests from shared/ have been moved to generic/, remove the Makefile
and the reference from the 'check' scripts.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 check                 |  2 +-
 tests/shared/Makefile | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 tests/shared/Makefile

diff --git a/check b/check
index c6dba89b5b506e..d2cd23b7e161b4 100755
--- a/check
+++ b/check
@@ -49,7 +49,7 @@ timestamp=${TIMESTAMP:=false}
 
 rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.report.* $tmp.arglist
 
-SRC_GROUPS="generic shared"
+SRC_GROUPS="generic"
 export SRC_DIR="tests"
 
 usage()
diff --git a/tests/shared/Makefile b/tests/shared/Makefile
deleted file mode 100644
index 2e6aa718446171..00000000000000
--- a/tests/shared/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
-#
-
-TOPDIR = ../..
-include $(TOPDIR)/include/builddefs
-include $(TOPDIR)/include/buildgrouplist
-
-SHARED_DIR = shared
-TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(SHARED_DIR)
-DIRT = group.list
-
-default: $(DIRT)
-
-include $(BUILDRULES)
-
-install: default
-	$(INSTALL) -m 755 -d $(TARGET_DIR)
-	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
-	$(INSTALL) -m 644 group.list $(TARGET_DIR)
-	$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
-
-# Nothing.
-install-dev install-lib:
-- 
2.44.0

Re: [PATCH 0/4] Move test cased from shared to generic

[Darrick J. Wong]

On Tue, May 07, 2024 at 09:07:28PM +0200, David Sterba wrote:
> Hi,
> 
> as discussed recently, the tests in shared should be in generic.
> 
> Based on branch patches-in-queue, commit e098483c662d8f0b7583edca1501d8addd3b7549.

I'm glad to get rid of shared/ finally.  Modulo my question about the
.out files, I agree with this change.

Acked-by: Darrick J. Wong <djwong@kernel.org>

--D

> 
> David Sterba (4):
>   Move shared/298 to generic/740
>   Move shared/002 to generic/745
>   Move shared/298 to generic/746
>   Remove rest of shared/
> 
>  check                                     |  2 +-
>  tests/{shared/032 => generic/740}         |  2 +-
>  tests/{shared/032.out => generic/740.out} |  0
>  tests/{shared/002 => generic/745}         |  2 +-
>  tests/{shared/002.out => generic/745.out} |  0
>  tests/{shared/298 => generic/746}         |  2 +-
>  tests/{shared/298.out => generic/746.out} |  0
>  tests/shared/Makefile                     | 24 -----------------------
>  8 files changed, 4 insertions(+), 28 deletions(-)
>  rename tests/{shared/032 => generic/740} (99%)
>  rename tests/{shared/032.out => generic/740.out} (100%)
>  rename tests/{shared/002 => generic/745} (99%)
>  rename tests/{shared/002.out => generic/745.out} (100%)
>  rename tests/{shared/298 => generic/746} (99%)
>  rename tests/{shared/298.out => generic/746.out} (100%)
>  delete mode 100644 tests/shared/Makefile
> 
> -- 
> 2.44.0
> 
> 

Re: [PATCH 0/4] Move test cased from shared to generic

[Zorro Lang]

On Tue, May 07, 2024 at 09:07:28PM +0200, David Sterba wrote:
> Hi,
> 
> as discussed recently, the tests in shared should be in generic.
> 
> Based on branch patches-in-queue, commit e098483c662d8f0b7583edca1501d8addd3b7549.
> 
> David Sterba (4):
>   Move shared/298 to generic/740
>   Move shared/002 to generic/745
>   Move shared/298 to generic/746

Thanks David! There're two shared/298 above, I think the former is shared/032 :)
And I foundd that all .out files were not changed properly, so I suppose you
did that manually. The "mvtest" tool will help you, e.g.

# ./tools/mvtest shared/032 generic/740
# ./tools/mvtest shared/002 generic/745
# ./tools/mvtest shared/298 generic/746

Thanks,
Zorro

>   Remove rest of shared/
> 
>  check                                     |  2 +-
>  tests/{shared/032 => generic/740}         |  2 +-
>  tests/{shared/032.out => generic/740.out} |  0
>  tests/{shared/002 => generic/745}         |  2 +-
>  tests/{shared/002.out => generic/745.out} |  0
>  tests/{shared/298 => generic/746}         |  2 +-
>  tests/{shared/298.out => generic/746.out} |  0
>  tests/shared/Makefile                     | 24 -----------------------
>  8 files changed, 4 insertions(+), 28 deletions(-)
>  rename tests/{shared/032 => generic/740} (99%)
>  rename tests/{shared/032.out => generic/740.out} (100%)
>  rename tests/{shared/002 => generic/745} (99%)
>  rename tests/{shared/002.out => generic/745.out} (100%)
>  rename tests/{shared/298 => generic/746} (99%)
>  rename tests/{shared/298.out => generic/746.out} (100%)
>  delete mode 100644 tests/shared/Makefile
> 
> -- 
> 2.44.0
> 
> 

Re: [PATCH 0/4] Move test cased from shared to generic

[David Sterba]

On Thu, May 09, 2024 at 01:29:01PM +0800, Zorro Lang wrote:
> On Tue, May 07, 2024 at 09:07:28PM +0200, David Sterba wrote:
> > Hi,
> > 
> > as discussed recently, the tests in shared should be in generic.
> > 
> > Based on branch patches-in-queue, commit e098483c662d8f0b7583edca1501d8addd3b7549.
> > 
> > David Sterba (4):
> >   Move shared/298 to generic/740
> >   Move shared/002 to generic/745
> >   Move shared/298 to generic/746
> 
> Thanks David! There're two shared/298 above, I think the former is shared/032 :)

I noticed the wrong subject of patch before sending and updated the
patch manually but not the summary in the cover letter.

> And I foundd that all .out files were not changed properly, so I suppose you
> did that manually. The "mvtest" tool will help you, e.g.
> 
> # ./tools/mvtest shared/032 generic/740
> # ./tools/mvtest shared/002 generic/745
> # ./tools/mvtest shared/298 generic/746

I didn't know such tool exist so yeah I forgot to update the .out too.
Do you want a resend or can you fix that when committing?

Re: [PATCH 0/4] Move test cased from shared to generic

[Zorro Lang]

On Thu, May 09, 2024 at 06:28:55PM +0200, David Sterba wrote:
> On Thu, May 09, 2024 at 01:29:01PM +0800, Zorro Lang wrote:
> > On Tue, May 07, 2024 at 09:07:28PM +0200, David Sterba wrote:
> > > Hi,
> > > 
> > > as discussed recently, the tests in shared should be in generic.
> > > 
> > > Based on branch patches-in-queue, commit e098483c662d8f0b7583edca1501d8addd3b7549.
> > > 
> > > David Sterba (4):
> > >   Move shared/298 to generic/740
> > >   Move shared/002 to generic/745
> > >   Move shared/298 to generic/746
> > 
> > Thanks David! There're two shared/298 above, I think the former is shared/032 :)
> 
> I noticed the wrong subject of patch before sending and updated the
> patch manually but not the summary in the cover letter.
> 
> > And I foundd that all .out files were not changed properly, so I suppose you
> > did that manually. The "mvtest" tool will help you, e.g.
> > 
> > # ./tools/mvtest shared/032 generic/740
> > # ./tools/mvtest shared/002 generic/745
> > # ./tools/mvtest shared/298 generic/746
> 
> I didn't know such tool exist so yeah I forgot to update the .out too.
> Do you want a resend or can you fix that when committing?

Sure, as this patch has gotten RVB from Darrick, and if you and Christoph all tend to
improve the _require_xxx helpers later, I can merge this patchset at first (rewrite
with mvtest script :)

Thanks,
Zorro

>