From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 14 Dec 2012 20:24:04 +0000 (-0800)
Subject: Revert "Temporarily disable the reguid test."
X-Git-Tag: debian/0.7.9-2~340^2~16^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5ac0c30a94a0804080f0a89c9b7a31f8d4ab5708;p=mirror_zfs-debian.git

Revert "Temporarily disable the reguid test."

This reverts commit d13524579162b35189804c357a63993be758b84c.
Since feature flags have now been merged we can apply the real
upstream fix from Illumos.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #997
---

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index cc2db31e..0dace496 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -361,13 +361,7 @@ ztest_info_t ztest_info[] = {
 	{ ztest_fault_inject,			1,	&zopt_sometimes	},
 	{ ztest_ddt_repair,			1,	&zopt_sometimes	},
 	{ ztest_dmu_snapshot_hold,		1,	&zopt_sometimes	},
-	/*
-	 * The reguid test is currently broken. Disable it until
-	 * we get around to fixing it.
-	 */
-#if 0
 	{ ztest_reguid,				1,	&zopt_sometimes },
-#endif
 	{ ztest_spa_rename,			1,	&zopt_rarely	},
 	{ ztest_scrub,				1,	&zopt_rarely	},
 	{ ztest_dsl_dataset_promote_busy,	1,	&zopt_rarely	},