Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/fix-zfs-xfs-generic into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

The xfstest-bld upstream has been updated with some structural change,
(e.g. the get-all and build-all script has been moved to fstests-bld).

We will need to modify our test case to make it work.

I left local patches untouched just in case.

Build tested with:
  * X-4.4 amd64
  * B-4.15 amd64
  * F-5.4 amd64
  * F-oem-5.14 amd64
  * J-5.15 amd64
  * K-5.19 amd64

For ubuntu_xfstests_*,

Remove the os_dep check, if we're missing any tool we will know it
directly from test build output. There is no need to make extra checks
here. Furthermore, the dependency could change from time to time with
test suite update from upstream.

Build tested with:
  * X-4.4 amd64 / i386
  * B-4.15 amd64
  * F-5.4 amd64
  * J-5.15 amd64
  * K-5.19 amd64

Note that I have re-constructed the required package list, we can get back to this to add more packages if needed.

[Andrei Gherzan (agherzan)]

This looks good to me but I haven't tried it out.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, I will have Francis's change ready later.

diff --git a/ubuntu_xfstests_btrfs/ubuntu_xfstests_btrfs.py b/ubuntu_xfstests_btrfs/ubuntu_xfstests_btrfs.py
index ee5937f..f3a12c4 100644
--- a/ubuntu_xfstests_btrfs/ubuntu_xfstests_btrfs.py
+++ b/ubuntu_xfstests_btrfs/ubuntu_xfstests_btrfs.py
@@ -1,9 +1,11 @@
-import multiprocessing
-import os, re, glob, logging
+import os
+import re
+import glob
+import logging
 import platform
 import shutil
 from autotest.client.shared import error
-from autotest.client import test, utils, os_dep
+from autotest.client import test, utils
 from autotest.client import canonical
 
 class ubuntu_xfstests_btrfs(test.test):
@@ -25,7 +27,7 @@ class ubuntu_xfstests_btrfs(test.test):
         return tests_list
 
     def install_required_pkgs(self):
-        arch   = platform.processor()
+        arch = platform.processor()
         try:
             series = platform.dist()[2]
         except AttributeError:
@@ -41,32 +43,22 @@ class ubuntu_xfstests_btrfs(test.test):
             'build-essential',
             'dbench',
             'dump',
-            'fio',
             'gettext',
-            'git',
-            'keyutils',
-            'kpartx',
-            'libacl1-dev',
-            'libaio-dev',
-            'libattr1-dev',
             'libblkid-dev',
+            'libicu-dev',
             'libssl-dev',
             'libtool',
             'patchutils',
-            'pkg-config',
+            'pkgconf',
             'quota',
-            'texinfo',
-            'texlive',
-            'thin-provisioning-tools',
-            'xfsdump',
-            'xfslibs-dev'
+            'uuid-dev'
         ]
+
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
         pkgs.append(gcc)
 
         if series not in ['precise', 'trusty']:
             pkgs.append('btrfs-progs')
-            pkgs.append('libtool-bin')
         if series not in ['precise', 'trusty', 'xenial']:
             pkgs.append('duperemove')
 
@@ -74,7 +66,7 @@ class ubuntu_xfstests_btrfs(test.test):
         self.results = utils.system_output(cmd, retain_output=True)
 
     def _run_sub_test(self, test):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
         output = utils.system_output('./check %s' % test,
                                      ignore_status=True,
                                      retain_output=True)
@@ -135,10 +127,12 @@ class ubuntu_xfstests_btrfs(test.test):
 
 
     def _run_suite(self):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        output = utils.system_output('./check -g auto -x dangerous',
-                                     ignore_status=True,
-                                     retain_output=True)
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
+        exclusion = os.path.join(self.srcdir, 'xfstests-bld', 'test-appliance', 'files',
+                                 'root', 'fs', 'btrfs', 'exclude')
+        utils.system_output('./check -E %s -g auto -x dangerous' % exclusion,
+                            ignore_status=True,
+                            retain_output=True)
 
     def initialize(self):
         pass
@@ -152,22 +146,6 @@ class ubuntu_xfstests_btrfs(test.test):
         utils.system_output('useradd -m fsgqa || true', retain_output=True)
         utils.system_output('grep -q fsgqa /etc/sudoers || echo \"fsgqa    ALL=(ALL)NOPASSWD: ALL\" >> /etc/sudoers', retain_output=True)
 
-        #
-        # Anticipate failures due to missing devel tools, libraries, headers
-        # and xfs commands
-        #
-        os_dep.command('autoconf')
-        os_dep.command('autoheader')
-        os_dep.command('libtool')
-        os_dep.library('libuuid.so.1')
-        #os_dep.header('xfs/xfs.h')
-        #os_dep.header('attr/xattr.h')
-        #os_dep.header('sys/acl.h')
-        os_dep.command('mkfs.xfs')
-        os_dep.command('xfs_db')
-        os_dep.command('xfs_bmap')
-        os_dep.command('xfsdump')
-
         self.job.require_gcc()
 
         canonical.setup_proxy()
@@ -176,34 +154,16 @@ class ubuntu_xfstests_btrfs(test.test):
         os.chdir(self.srcdir)
         shutil.rmtree('xfstests-bld', ignore_errors=True)
         utils.system('git clone https://github.com/tytso/xfstests-bld')
+
         os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        commit_bld = 'a4df7d7b31125901cb1fe9b092f495b6aa950448'
+        commit_bld = '8672804daa67855739592070e1732991179c2ba9'
         print("Using head commit for xfstests-bld " + commit_bld)
         utils.system('git reset --hard ' + commit_bld)
-        # print("Patching xfstests-bld to add ARM64 xattr syscall support")
-        # utils.system('patch -p1 < %s/0004-Add-syscalls-for-ARM64-platforms-LP-1755499.patch' % self.bindir)
-        #
-        #  Fix build link issues with newer toolchains (this is an ugly hack)
-        #
-        if float(platform.linux_distribution()[1]) > 18.04:
-            print("Patching xfstest-blkd to fix static linking issue")
-            utils.system('patch -p1 < %s/0005-build-all-remove-static-linking-flags-to-fix-build-i.patch' % self.bindir)
-        print("Fetching all repos..")
-        utils.system('./get-all')
 
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        commit = '82eda8820ddd68dab0bc35199a53a08f58b1d26c'
-        print("Using xfs from known stable commit point " + commit)
-        utils.system('git reset --hard ' + commit)
-        print("Patching xfstests..")
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        print("Building xfstests")
-        utils.system('pwd')
-        try:
-            nprocs = '-j' + str(multiprocessing.cpu_count())
-        except:
-            nprocs = ''
-        utils.make(nprocs)
+        print("Building tests...")
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld'))
+        utils.system('./get-all')
+        utils.system('./build-all')
 
         logging.debug("Available tests in srcdir: %s" %
                       ", ".join(self._get_available_tests()))
@@ -213,10 +173,10 @@ class ubuntu_xfstests_btrfs(test.test):
         return utils.system('/bin/bash %s/create-test-partitions %s %s' % (self.bindir, os.environ['XFSTESTS_TEST_DRIVE'], filesystem))
 
     def unmount_partitions(self):
-        for mnt_point in [ os.environ['SCRATCH_MNT'], os.environ['TEST_DIR'] ]:
+        for mnt_point in [os.environ['SCRATCH_MNT'], os.environ['TEST_DIR']]:
             utils.system('umount %s' % mnt_point, ignore_status=True)
 
-    def run_once(self, test_name, filesystem='ext4', test_number='000', single=False, skip_dangerous=True):
+    def run_once(self, test_name, filesystem='btrfs', test_number='000', single=False, skip_dangerous=True):
         if test_name == 'setup':
             return
 
diff --git a/ubuntu_xfstests_ext4/ubuntu_xfstests_ext4.py b/ubuntu_xfstests_ext4/ubuntu_xfstests_ext4.py
index 2df880b..279781d 100644
--- a/ubuntu_xfstests_ext4/ubuntu_xfstests_ext4.py
+++ b/ubuntu_xfstests_ext4/ubuntu_xfstests_ext4.py
@@ -1,9 +1,11 @@
-import multiprocessing
-import os, re, glob, logging
+import os
+import re
+import glob
+import logging
 import platform
 import shutil
 from autotest.client.shared import error
-from autotest.client import test, utils, os_dep
+from autotest.client import test, utils
 from autotest.client import canonical
 
 class ubuntu_xfstests_ext4(test.test):
@@ -25,7 +27,7 @@ class ubuntu_xfstests_ext4(test.test):
         return tests_list
 
     def install_required_pkgs(self):
-        arch   = platform.processor()
+        arch = platform.processor()
         try:
             series = platform.dist()[2]
         except AttributeError:
@@ -41,32 +43,20 @@ class ubuntu_xfstests_ext4(test.test):
             'build-essential',
             'dbench',
             'dump',
-            'fio',
             'gettext',
-            'git',
-            'keyutils',
-            'kpartx',
-            'libacl1-dev',
-            'libaio-dev',
-            'libattr1-dev',
             'libblkid-dev',
+            'libicu-dev',
             'libssl-dev',
             'libtool',
             'patchutils',
-            'pkg-config',
+            'pkgconf',
             'quota',
-            'texinfo',
-            'texlive',
-            'thin-provisioning-tools',
-            'xfsdump',
-            'xfslibs-dev'
+            'uuid-dev'
         ]
+
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
         pkgs.append(gcc)
 
-        if series not in ['precise', 'trusty']:
-            pkgs.append('btrfs-progs')
-            pkgs.append('libtool-bin')
         if series not in ['precise', 'trusty', 'xenial']:
             pkgs.append('duperemove')
 
@@ -74,7 +64,7 @@ class ubuntu_xfstests_ext4(test.test):
         self.results = utils.system_output(cmd, retain_output=True)
 
     def _run_sub_test(self, test):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
         output = utils.system_output('./check %s' % test,
                                      ignore_status=True,
                                      retain_output=True)
@@ -135,12 +125,12 @@ class ubuntu_xfstests_ext4(test.test):
 
 
     def _run_suite(self):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        exclusion = os.path.join(self.srcdir, 'xfstests-bld', 'kvm-xfstests',
-                'test-appliance', 'files', 'root', 'fs', 'ext4', 'exclude')
-        output = utils.system_output('./check -E %s -g auto -x dangerous' % exclusion,
-                                     ignore_status=True,
-                                     retain_output=True)
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
+        exclusion = os.path.join(self.srcdir, 'xfstests-bld', 'test-appliance', 'files',
+                                 'root', 'fs', 'ext4', 'exclude')
+        utils.system_output('./check -E %s -g auto -x dangerous' % exclusion,
+                            ignore_status=True,
+                            retain_output=True)
 
     def initialize(self):
         pass
@@ -154,22 +144,6 @@ class ubuntu_xfstests_ext4(test.test):
         utils.system_output('useradd -m fsgqa || true', retain_output=True)
         utils.system_output('grep -q fsgqa /etc/sudoers || echo \"fsgqa    ALL=(ALL)NOPASSWD: ALL\" >> /etc/sudoers', retain_output=True)
 
-        #
-        # Anticipate failures due to missing devel tools, libraries, headers
-        # and xfs commands
-        #
-        os_dep.command('autoconf')
-        os_dep.command('autoheader')
-        os_dep.command('libtool')
-        os_dep.library('libuuid.so.1')
-        #os_dep.header('xfs/xfs.h')
-        #os_dep.header('attr/xattr.h')
-        #os_dep.header('sys/acl.h')
-        os_dep.command('mkfs.xfs')
-        os_dep.command('xfs_db')
-        os_dep.command('xfs_bmap')
-        os_dep.command('xfsdump')
-
         self.job.require_gcc()
 
         canonical.setup_proxy()
@@ -178,34 +152,16 @@ class ubuntu_xfstests_ext4(test.test):
         os.chdir(self.srcdir)
         shutil.rmtree('xfstests-bld', ignore_errors=True)
         utils.system('git clone https://github.com/tytso/xfstests-bld')
+
         os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        commit_bld = 'a4df7d7b31125901cb1fe9b092f495b6aa950448'
+        commit_bld = '8672804daa67855739592070e1732991179c2ba9'
         print("Using head commit for xfstests-bld " + commit_bld)
         utils.system('git reset --hard ' + commit_bld)
-        # print("Patching xfstests-bld to add ARM64 xattr syscall support")
-        # utils.system('patch -p1 < %s/0004-Add-syscalls-for-ARM64-platforms-LP-1755499.patch' % self.bindir)
-        #
-        #  Fix build link issues with newer toolchains (this is an ugly hack)
-        #
-        if float(platform.linux_distribution()[1]) > 18.04:
-            print("Patching xfstest-blkd to fix static linking issue")
-            utils.system('patch -p1 < %s/0005-build-all-remove-static-linking-flags-to-fix-build-i.patch' % self.bindir)
-        print("Fetching all repos..")
-        utils.system('./get-all')
 
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        commit = '82eda8820ddd68dab0bc35199a53a08f58b1d26c'
-        print("Using xfs from known stable commit point " + commit)
-        utils.system('git reset --hard ' + commit)
-        print("Patching xfstests..")
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        print("Building xfstests")
-        utils.system('pwd')
-        try:
-            nprocs = '-j' + str(multiprocessing.cpu_count())
-        except:
-            nprocs = ''
-        utils.make(nprocs)
+        print("Building tests...")
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld'))
+        utils.system('./get-all')
+        utils.system('./build-all')
 
         logging.debug("Available tests in srcdir: %s" %
                       ", ".join(self._get_available_tests()))
@@ -215,7 +171,7 @@ class ubuntu_xfstests_ext4(test.test):
         return utils.system('/bin/bash %s/create-test-partitions %s %s' % (self.bindir, os.environ['XFSTESTS_TEST_DRIVE'], filesystem))
 
     def unmount_partitions(self):
-        for mnt_point in [ os.environ['SCRATCH_MNT'], os.environ['TEST_DIR'] ]:
+        for mnt_point in [os.environ['SCRATCH_MNT'], os.environ['TEST_DIR']]:
             utils.system('umount %s' % mnt_point, ignore_status=True)
 
     def run_once(self, test_name, filesystem='ext4', test_number='000', single=False, skip_dangerous=True):
diff --git a/ubuntu_xfstests_xfs/ubuntu_xfstests_xfs.py b/ubuntu_xfstests_xfs/ubuntu_xfstests_xfs.py
index 7e0d9a0..8d695b0 100644
--- a/ubuntu_xfstests_xfs/ubuntu_xfstests_xfs.py
+++ b/ubuntu_xfstests_xfs/ubuntu_xfstests_xfs.py
@@ -1,9 +1,11 @@
-import multiprocessing
-import os, re, glob, logging
+import os
+import re
+import glob
+import logging
 import platform
 import shutil
 from autotest.client.shared import error
-from autotest.client import test, utils, os_dep
+from autotest.client import test, utils
 from autotest.client import canonical
 
 class ubuntu_xfstests_xfs(test.test):
@@ -25,7 +27,7 @@ class ubuntu_xfstests_xfs(test.test):
         return tests_list
 
     def install_required_pkgs(self):
-        arch   = platform.processor()
+        arch = platform.processor()
         try:
             series = platform.dist()[2]
         except AttributeError:
@@ -39,28 +41,18 @@ class ubuntu_xfstests_xfs(test.test):
             'autopoint',
             'bc',
             'build-essential',
-            'dbench',
             'dump',
-            'fio',
             'gettext',
-            'git',
-            'keyutils',
-            'kpartx',
-            'libacl1-dev',
-            'libaio-dev',
-            'libattr1-dev',
             'libblkid-dev',
+            'libicu-dev',
             'libssl-dev',
             'libtool',
             'patchutils',
-            'pkg-config',
+            'pkgconf',
             'quota',
-            'texinfo',
-            'texlive',
-            'thin-provisioning-tools',
-            'xfsdump',
-            'xfslibs-dev'
+            'uuid-dev'
         ]
+
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
         pkgs.append(gcc)
 
@@ -74,7 +66,7 @@ class ubuntu_xfstests_xfs(test.test):
         self.results = utils.system_output(cmd, retain_output=True)
 
     def _run_sub_test(self, test):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
         output = utils.system_output('./check %s' % test,
                                      ignore_status=True,
                                      retain_output=True)
@@ -135,10 +127,11 @@ class ubuntu_xfstests_xfs(test.test):
 
 
     def _run_suite(self):
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        output = utils.system_output('./check -g auto -x dangerous',
-                                     ignore_status=True,
-                                     retain_output=True)
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
+        # Unlike btrfs and ext4, thers is no exclusion file for xfs
+        utils.system_output('./check -g auto -x dangerous',
+                            ignore_status=True,
+                            retain_output=True)
 
     def initialize(self):
         pass
@@ -152,22 +145,6 @@ class ubuntu_xfstests_xfs(test.test):
         utils.system_output('useradd -m fsgqa || true', retain_output=True)
         utils.system_output('grep -q fsgqa /etc/sudoers || echo \"fsgqa    ALL=(ALL)NOPASSWD: ALL\" >> /etc/sudoers', retain_output=True)
 
-        #
-        # Anticipate failures due to missing devel tools, libraries, headers
-        # and xfs commands
-        #
-        os_dep.command('autoconf')
-        os_dep.command('autoheader')
-        os_dep.command('libtool')
-        os_dep.library('libuuid.so.1')
-        #os_dep.header('xfs/xfs.h')
-        #os_dep.header('attr/xattr.h')
-        #os_dep.header('sys/acl.h')
-        os_dep.command('mkfs.xfs')
-        os_dep.command('xfs_db')
-        os_dep.command('xfs_bmap')
-        os_dep.command('xfsdump')
-
         self.job.require_gcc()
 
         canonical.setup_proxy()
@@ -176,34 +153,16 @@ class ubuntu_xfstests_xfs(test.test):
         os.chdir(self.srcdir)
         shutil.rmtree('xfstests-bld', ignore_errors=True)
         utils.system('git clone https://github.com/tytso/xfstests-bld')
+
         os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        commit_bld = 'a4df7d7b31125901cb1fe9b092f495b6aa950448'
+        commit_bld = '8672804daa67855739592070e1732991179c2ba9'
         print("Using head commit for xfstests-bld " + commit_bld)
         utils.system('git reset --hard ' + commit_bld)
-        # print("Patching xfstests-bld to add ARM64 xattr syscall support")
-        # utils.system('patch -p1 < %s/0004-Add-syscalls-for-ARM64-platforms-LP-1755499.patch' % self.bindir)
-        #
-        #  Fix build link issues with newer toolchains (this is an ugly hack)
-        #
-        if float(platform.linux_distribution()[1]) > 18.04:
-            print("Patching xfstest-blkd to fix static linking issue")
-            utils.system('patch -p1 < %s/0005-build-all-remove-static-linking-flags-to-fix-build-i.patch' % self.bindir)
-        print("Fetching all repos..")
-        utils.system('./get-all')
 
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        commit = '82eda8820ddd68dab0bc35199a53a08f58b1d26c'
-        print("Using xfs from known stable commit point " + commit)
-        utils.system('git reset --hard ' + commit)
-        print("Patching xfstests..")
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        print("Building xfstests")
-        utils.system('pwd')
-        try:
-            nprocs = '-j' + str(multiprocessing.cpu_count())
-        except:
-            nprocs = ''
-        utils.make(nprocs)
+        print("Building tests...")
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld'))
+        utils.system('./get-all')
+        utils.system('./build-all')
 
         logging.debug("Available tests in srcdir: %s" %
                       ", ".join(self._get_available_tests()))
@@ -213,10 +172,10 @@ class ubuntu_xfstests_xfs(test.test):
         return utils.system('/bin/bash %s/create-test-partitions %s %s' % (self.bindir, os.environ['XFSTESTS_TEST_DRIVE'], filesystem))
 
     def unmount_partitions(self):
-        for mnt_point in [ os.environ['SCRATCH_MNT'], os.environ['TEST_DIR'] ]:
+        for mnt_point in [os.environ['SCRATCH_MNT'], os.environ['TEST_DIR']]:
             utils.system('umount %s' % mnt_point, ignore_status=True)
 
-    def run_once(self, test_name, filesystem='ext4', test_number='000', single=False, skip_dangerous=True):
+    def run_once(self, test_name, filesystem='xfs', test_number='000', single=False, skip_dangerous=True):
         if test_name == 'setup':
             return
 
diff --git a/ubuntu_zfs_xfs_generic/0001-xfstests-add-minimal-support-for-zfs.patch b/ubuntu_zfs_xfs_generic/0001-xfstests-add-minimal-support-for-zfs.patch
index ca4a5eb..94fd488 100644
--- a/ubuntu_zfs_xfs_generic/0001-xfstests-add-minimal-support-for-zfs.patch
+++ b/ubuntu_zfs_xfs_generic/0001-xfstests-add-minimal-support-for-zfs.patch
@@ -1,10 +1,10 @@
-From 4d06185605e6c99c7b51ede23390b7fc268fc748 Mon Sep 17 00:00:00 2001
+From 42147099e0c628882cab36127bd09d371ffd74ab Mon Sep 17 00:00:00 2001
 From: Po-Hsu Lin <[e-mail]>
-Date: Wed, 18 Sep 2019 16:28:42 +0000
+Date: Thu, 16 Mar 2023 16:10:48 +0000
 Subject: [PATCH] xfstests: add minimal support for zfs
 
 Patch created based on Colin Ian King's commit bb18b1b9 in autotest-client-tests.
-Reworked to make it comply with the lastest xfstest-dev commit 204860fa.
+Reworked to make it comply with the lastest xfstest-dev commit b90914df.
 
 Currently the following tests work:
 
@@ -155,34 +155,35 @@ common/* scripts:
 
 Signed-off-by: Po-Hsu Lin <[e-mail]>
 ---
- check         |  2 ++
- common/attr   |  7 +++++--
+ check         |  3 ++-
+ common/attr   |  3 +++
  common/config |  4 ++++
  common/rc     | 22 ++++++++++++++++++++++
- 4 files changed, 33 insertions(+), 2 deletions(-)
+ 4 files changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/check b/check
-index 3d6a64cd..5970bf16 100755
+index 0bf5b22e..e9979475 100755
 --- a/check
 +++ b/check
-@@ -60,6 +60,7 @@ check options
-     -pvfs2          test PVFS2
-     -tmpfs              test TMPFS
-     -ubifs              test ubifs
-+    -zfs                test zfs
+@@ -66,6 +66,7 @@ check options
+     -pvfs2		test PVFS2
+     -tmpfs		test TMPFS
+     -ubifs		test ubifs
++    -zfs		test zfs
      -l			line mode diff
      -udiff		show unified diff (default)
      -n			show me, do not run tests
-@@ -272,6 +273,7 @@ while [ $# -gt 0 ]; do
- 	-pvfs2)		FSTYP=pvfs2 ;;
- 	-tmpfs)		FSTYP=tmpfs ;;
- 	-ubifs)		FSTYP=ubifs ;;
-+	-zfs)		FSTYP=zfs ;;
+@@ -280,7 +281,7 @@ while [ $# -gt 0 ]; do
+ 	case "$1" in
+ 	-\? | -h | --help) usage ;;
  
- 	-g)	group=$2 ; shift ;
- 		GROUP_LIST="$GROUP_LIST ${group//,/ }"
+-	-nfs|-glusterfs|-cifs|-9p|-fuse|-virtiofs|-pvfs2|-tmpfs|-ubifs)
++	-nfs|-glusterfs|-cifs|-9p|-fuse|-virtiofs|-pvfs2|-tmpfs|-ubifs|-zfs)
+ 		FSTYP="${1:1}"
+ 		;;
+ 	-overlay)
 diff --git a/common/attr b/common/attr
-index 20049de0..d6e543b9 100644
+index cce4d1b2..b89d17b7 100644
 --- a/common/attr
 +++ b/common/attr
 @@ -25,6 +25,9 @@ _acl_get_max()
@@ -193,62 +194,35 @@ index 20049de0..d6e543b9 100644
 +		echo 1024
 +		;;
  	f2fs)
- 		_fs_options $TEST_DEV | grep "inline_xattr" >/dev/null 2>&1
- 		if [ $? -eq 0 ]; then
-@@ -238,7 +241,7 @@ _getfattr()
- 
- # set maximum total attr space based on fs type
- case "$FSTYP" in
--xfs|udf|pvfs2|9p|ceph)
-+xfs|udf|pvfs2|9p|ceph|zfs)
- 	MAX_ATTRS=1000
- 	;;
- *)
-@@ -252,7 +255,7 @@ export MAX_ATTRS
- 
- # Set max attr value size based on fs type
- case "$FSTYP" in
--xfs|udf|btrfs)
-+xfs|udf|btrfs|zfs)
- 	MAX_ATTRVAL_SIZE=64
- 	;;
- pvfs2)
+ 		# If noinline_xattr is enabled, max xattr size should be:
+ 		# (4096 - 24) - (24 + 4) = 4044
 diff --git a/common/config b/common/config
-index 4c86a492..97dc96e9 100644
+index 6c8cb3a5..a987d4a3 100644
 --- a/common/config
 +++ b/common/config
-@@ -362,6 +362,8 @@ _test_mount_opts()
- 		# acls & xattrs aren't turned on by default on older ext$FOO
- 		export TEST_FS_MOUNT_OPTS="-o acl,user_xattr $EXT_MOUNT_OPTIONS"
+@@ -391,6 +391,8 @@ _common_mount_opts()
+ 	ubifs)
+ 		echo $UBIFS_MOUNT_OPTIONS
  		;;
 +	zfs)
 +		;;
  	*)
  		;;
  	esac
-@@ -478,6 +480,8 @@ _check_device()
+@@ -588,6 +590,8 @@ _check_device()
  	fi
  
  	case "$FSTYP" in
 +	zfs)
-+		;;
- 	9p|tmpfs)
- 		# 9p mount tags are just plain strings, so anything is allowed
++ 		;;
+ 	9p|fuse|tmpfs|virtiofs)
+ 		# 9p, fuse and virtiofs mount tags are just plain strings, so anything is allowed
  		# tmpfs doesn't use mount source, ignore
 diff --git a/common/rc b/common/rc
-index 66c7fd4d..51c4f36e 100644
+index 6852af79..600b0617 100644
 --- a/common/rc
 +++ b/common/rc
-@@ -153,6 +153,8 @@ case "$FSTYP" in
-     reiser4)
- 	 [ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
- 	 ;;
-+    zfs)
-+	;;
-     pvfs2)
- 	;;
-     ubifs)
-@@ -624,6 +626,9 @@ _test_mkfs()
+@@ -602,6 +602,9 @@ _test_mkfs()
      ext2|ext3|ext4)
  	$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* $TEST_DEV
  	;;
@@ -258,17 +232,17 @@ index 66c7fd4d..51c4f36e 100644
      *)
  	yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* $TEST_DEV
  	;;
-@@ -656,6 +661,9 @@ _mkfs_dev()
- 	$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* \
- 		2>$tmp.mkfserr 1>$tmp.mkfsstd
+@@ -638,6 +641,9 @@ _try_mkfs_dev()
+     ext2|ext3|ext4)
+ 	$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $*
  	;;
 +    zfs)
 +		# do nothing for zfs
 +	;;
      xfs)
- 	$MKFS_PROG -t $FSTYP -- -f $MKFS_OPTIONS $* \
- 		2>$tmp.mkfserr 1>$tmp.mkfsstd
-@@ -757,6 +765,10 @@ _scratch_mkfs()
+ 	$MKFS_PROG -t $FSTYP -- -f $MKFS_OPTIONS $*
+ 	;;
+@@ -741,6 +747,10 @@ _scratch_mkfs()
  		mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --"
  		mkfs_filter="grep -v -e ^mkfs\.ocfs2"
  		;;
@@ -279,7 +253,16 @@ index 66c7fd4d..51c4f36e 100644
  	*)
  		mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --"
  		mkfs_filter="cat"
-@@ -1534,6 +1546,8 @@ _require_scratch_nocheck()
+@@ -1034,6 +1044,8 @@ _scratch_mkfs_sized()
+ 	bcachefs)
+ 		$MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS --fs_size=$fssize --block_size=$blocksize $SCRATCH_DEV
+ 		;;
++	zfs)
++		;;
+ 	*)
+ 		_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
+ 		;;
+@@ -1663,6 +1675,8 @@ _require_scratch_nocheck()
  			_notrun "this test requires a valid \$SCRATCH_MNT"
  		fi
  		;;
@@ -288,7 +271,7 @@ index 66c7fd4d..51c4f36e 100644
  	*)
  		 if [ -z "$SCRATCH_DEV" -o "`_is_block_dev "$SCRATCH_DEV"`" = "" ]
  		 then
-@@ -1640,6 +1654,11 @@ _require_test()
+@@ -1847,6 +1861,11 @@ _require_test()
  			_notrun "this test requires a valid \$TEST_DIR"
  		fi
  		;;
@@ -300,7 +283,7 @@ index 66c7fd4d..51c4f36e 100644
  	tmpfs)
  		if [ -z "$TEST_DEV" -o ! -d "$TEST_DIR" ];
  		then
-@@ -2712,6 +2731,9 @@ _check_test_fs()
+@@ -3171,6 +3190,9 @@ _check_test_fs()
      tmpfs)
  	# no way to check consistency for tmpfs
  	;;
@@ -312,3 +295,4 @@ index 66c7fd4d..51c4f36e 100644
  	;;
 -- 
 2.17.1
+
diff --git a/ubuntu_zfs_xfs_generic/blacklist.vivid b/ubuntu_zfs_xfs_generic/blacklist.vivid
deleted file mode 100644
index d00491f..0000000
--- a/ubuntu_zfs_xfs_generic/blacklist.vivid
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
index 8fff91a..0d3b8f2 100644
--- a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
+++ b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py
@@ -11,7 +11,7 @@ class ubuntu_zfs_xfs_generic(test.test):
     version = 5
 
     def install_required_pkgs(self):
-        arch   = platform.processor()
+        arch = platform.processor()
         try:
             series = platform.dist()[2]
         except AttributeError:
@@ -22,33 +22,20 @@ class ubuntu_zfs_xfs_generic(test.test):
             'acl',
             'attr',
             'autoconf',
-            'automake',
             'autopoint',
             'bc',
             'build-essential',
-            'dbench',
-            'dump',
-            'e2fsprogs',
-            'fio',
-            'gawk',
-            'gdb',
+            'debootstrap',
             'gettext',
-            'git',
-            'kpartx',
-            'ksh',
-            'libtool',
-            'patchutils',
-            'pax',
-            'pkg-config',
-            'texinfo',
-            'texlive',
-            'quota',
-            'git',
             'libblkid-dev',
+            'libicu-dev',
             'libssl-dev',
-            'xfsprogs'
+            'libtool',
+            'patchutils',
+            'pkgconf',
+            'uuid-dev'
         ]
-        gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64' ] else 'gcc-multilib'
+        gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
         pkgs.append(gcc)
 
         if series in ['precise', 'trusty']:
@@ -83,49 +70,41 @@ class ubuntu_zfs_xfs_generic(test.test):
         utils.system('git clone https://github.com/tytso/xfstests-bld')
 
         os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        commit_bld = 'a4df7d7b31125901cb1fe9b092f495b6aa950448'
+        commit_bld = '8672804daa67855739592070e1732991179c2ba9'
         print("Using head commit for xfstests-bld " + commit_bld)
         utils.system('git reset --hard ' + commit_bld)
 
-        # print("Patching xfstests-bld to add ARM64 xattr syscall support")
-        # utils.system('patch -p1 < %s/0004-Add-syscalls-for-ARM64-platforms-LP-1755499.patch' % self.bindir)
-        print("Fetching all repos..")
+        print("Building tests...")
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld'))
         utils.system('./get-all')
+        utils.system('./build-all')
 
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
-        commit = "82eda8820ddd68dab0bc35199a53a08f58b1d26c"
-        print("Using xfs from known stable commit point " + commit)
-        utils.system('git reset --hard ' + commit)
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
         print("Patching xfstests-dev to add minimal support for ZFS")
         utils.system('patch -p1 < %s/0001-xfstests-add-minimal-support-for-zfs.patch' % self.bindir)
-        print("Patching xfstests-dev: fix warning with Awk 5.0.1")
-        utils.system('patch -p1 < %s/0006-generic-001-remove-unnecessary-backslash.patch' % self.bindir)
-        print("Running autoreconf --install")
-        utils.system('autoreconf --install')
-
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfsprogs-dev'))
-        print("Patching xfstests-dev: fix linker issues with modern gcc")
-        utils.system('patch -p1 < %s/0007-Fix-linker-issues-with-clashing-objects.patch' % self.bindir)
-
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fio'))
-        print("Patching fio: fix linker issues with modern gcc")
-        utils.system('patch -p1 < %s/0008-Fix-linker-issues-by-making-tsc_reliable-a-weak-refe.patch' % self.bindir)
-        print("Patch out raw support")
-        utils.system('patch -p1 < %s/382975557e632efb506836bc1709789e615c9094.patch' % self.bindir)
-
-#       os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-#       print("getting xfs tests source")
-#       utils.system('./get-all')
-
-#       os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfsprogs-dev'))
-#       print("Patching xfsprogs-dev to disable blkid")
-#       utils.system('patch -p1 < %s/0005-Disable-blkid-by-setting-enable_blkid-no.patch' % self.bindir)
-#
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld'))
-        print("Building xfstests")
-        utils.system('./build-all')
+
         utils.system('modprobe zfs')
 
+#        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
+#        commit = "82eda8820ddd68dab0bc35199a53a08f58b1d26c"
+#        print("Using xfs from known stable commit point " + commit)
+#        utils.system('git reset --hard ' + commit)
+#        print("Patching xfstests-dev: fix warning with Awk 5.0.1")
+#        utils.system('patch -p1 < %s/0006-generic-001-remove-unnecessary-backslash.patch' % self.bindir)
+#        print("Running autoreconf --install")
+#        utils.system('autoreconf --install')
+#
+#        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfsprogs-dev'))
+#        print("Patching xfstests-dev: fix linker issues with modern gcc")
+#        utils.system('patch -p1 < %s/0007-Fix-linker-issues-with-clashing-objects.patch' % self.bindir)
+#
+#        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fio'))
+#        print("Patching fio: fix linker issues with modern gcc")
+#        utils.system('patch -p1 < %s/0008-Fix-linker-issues-by-making-tsc_reliable-a-weak-refe.patch' % self.bindir)
+#        print("Patch out raw support")
+#        utils.system('patch -p1 < %s/382975557e632efb506836bc1709789e615c9094.patch' % self.bindir)
+
+
     def run_once(self, test_name):
         #
         #  We need to call setup first to trigger setup() being
@@ -133,7 +112,7 @@ class ubuntu_zfs_xfs_generic(test.test):
         #
         if test_name == 'setup':
             return
-        elif test_name == 'post-test-zfs-cleanup':
+        if test_name == 'post-test-zfs-cleanup':
             # Make sure there is no ZFS in use by any filesystem
             try:
                 utils.system('df -t zfs &> /dev/null') # return 1 if not found
@@ -149,11 +128,9 @@ class ubuntu_zfs_xfs_generic(test.test):
                 utils.system(cmd)
             return
 
-        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfstests-dev'))
+        os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fstests-bld', 'xfstests-dev'))
         cmd = '%s/ubuntu_zfs_xfs_generic.sh %s %s' % (self.bindir, test_name, self.srcdir)
         print("Running: " + cmd)
         self.results = utils.system_output(cmd, retain_output=True)
-        print(self.results)
-        print("Done!")
 
 # vi:set ts=4 sw=4 expandtab syntax=python: