K 10 svn:author V 7 asomers K 8 svn:date V 27 2017-09-07T15:30:52.300151Z K 7 svn:log V 1223 Fix zpool_import_013_neg from the ZFS test suite This test is supposed to check that ZFS will refuse to import a foreign, in-use pool without the "-f" flag. But it's always failed, because the blockfiles it tested were all from exported pools. I'm importing the change that Illumos made, which adds a new blockfile and tests only that. Also, in the interest of reducing runtime, I'm eliminating the setup and cleanup steps for this test, which create a pool for temporary storage. It's fine to just use TMPDIR. etc/mtree/BSD.tests.dist Add the blockfiles directory tests/sys/cddl/zfs/include/commands.txt Add bzcat to the list of commands tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/README tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2 tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh Use the new blockfile instead of the ones from zpool_upgrade, and dispense with the temporary pool. tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Clear the expected failure Sponsored by: Spectra Logic Corp END