regress: tweak deactivate aligned tests by default

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index 5081cbdd41c0b5741e347d99954b2409489e27d9..536ad88348c33014e204426713b5a8f7cedbf391 100644 (file)
--- a/regress/DartTestfile.txt.in
+++ b/regress/DartTestfile.txt.in
@@ -6,9 +6,11 @@ ADD_TEST(changer:two-pool-changer "@regressdir@/tests/two-pool-changer")
 ADD_TEST(changer:two-volume-changer "@regressdir@/tests/two-volume-changer")
 ADD_TEST(changer:vol-duration-changer "@regressdir@/tests/vol-duration-changer")
 
-#ADD_TEST(aligned:aligned-and-normal-test "@regressdir@/tests/aligned-and-normal-test")
-#ADD_TEST(aligned:aligned-multi-test "@regressdir@/tests/aligned-and-normal-test")
-#ADD_TEST(aligned:aligned-bug-1919-test "@regressdir@/tests/aligned-bug-1919-test")
+ADD_TEST(aligned:aligned-and-normal-test "@regressdir@/tests/aligned-and-normal-test")
+ADD_TEST(aligned:aligned-multi-test "@regressdir@/tests/aligned-and-normal-test")
+ADD_TEST(aligned:aligned-bug-1919-test "@regressdir@/tests/aligned-bug-1919-test")
+ADD_TEST(aligned:aligned-bug-8013-test "@regressdir@/tests/aligned-bug-8013-test")
+ADD_TEST(aligned:aligned-test "@regressdir@/tests/aligned-test")
 
 ADD_TEST(misc:btape-test "@regressdir@/tests/btape-test")
 
@@ -46,8 +48,6 @@ ADD_TEST(disk:auto-label-jobmedia-test "@regressdir@/tests/auto-label-jobmedia-t
 ADD_TEST(disk:accurate-test "@regressdir@/tests/accurate-test")
 ADD_TEST(disk:acl-xattr-test "@regressdir@/tests/acl-xattr-test")
 ADD_TEST(disk:action-on-purge-test "@regressdir@/tests/action-on-purge-test")
-ADD_TEST(disk:aligned-bug-8013-test "@regressdir@/tests/aligned-bug-8013-test")
-ADD_TEST(disk:aligned-test "@regressdir@/tests/aligned-test")
 ADD_TEST(disk:allowcompress-test "@regressdir@/tests/allowcompress-test")
 ADD_TEST(disk:auto-label-many-test "@regressdir@/tests/auto-label-many-test")
 ADD_TEST(disk:auto-label-test "@regressdir@/tests/auto-label-test")

diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index fe56ae68c0236408065335458cf8f47014c635b0..dabf709b4d019f202d7a35b1ddb2de2c2fa07e6e 100755 (executable)
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -11,7 +11,7 @@ echo "Start non-root disk tests"
 echo "Start non-root disk tests" >>test.out
 rm -f dumps/*
 ./run tests/acl-xattr-test
-./run tests/aligned-bug-8013-test
+#./run tests/aligned-bug-8013-test
 ./run tests/allowcompress-test
 ./run tests/auto-label-many-test
 ./run tests/auto-label-test
@@ -45,7 +45,7 @@ rm -f dumps/*
 ./run tests/copy-volume-test
 #./run tests/crazy-smaller-vol-test
 ./run tests/data-encrypt-test
-./run tests/aligned-test
+#./run tests/aligned-test
 ./run tests/delete-test
 ./run tests/differential-test
 ./run tests/encrypt-bug-test