mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-11 09:50:12 +00:00
Revert r362390, those tests are fixed by r362418
PR: 247425 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
e1cd6f7986
commit
bfd735d96e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=362551
@ -197,9 +197,6 @@ ufs1_head() {
|
|||||||
atf_set "descr" "fstyp(8) should detect UFS version 1 filesystems"
|
atf_set "descr" "fstyp(8) should detect UFS version 1 filesystems"
|
||||||
}
|
}
|
||||||
ufs1_body() {
|
ufs1_body() {
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
atf_check -s exit:0 mkdir dir
|
atf_check -s exit:0 mkdir dir
|
||||||
atf_check -s exit:0 -o ignore makefs -Z -s 64m ufs.img dir
|
atf_check -s exit:0 -o ignore makefs -Z -s 64m ufs.img dir
|
||||||
atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
|
atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
|
||||||
@ -211,9 +208,6 @@ ufs2_head() {
|
|||||||
atf_set "descr" "fstyp(8) should detect UFS version 2 filesystems"
|
atf_set "descr" "fstyp(8) should detect UFS version 2 filesystems"
|
||||||
}
|
}
|
||||||
ufs2_body() {
|
ufs2_body() {
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
atf_check -s exit:0 mkdir dir
|
atf_check -s exit:0 mkdir dir
|
||||||
atf_check -s exit:0 -o ignore makefs -o version=2 -Z -s 64m ufs.img dir
|
atf_check -s exit:0 -o ignore makefs -o version=2 -Z -s 64m ufs.img dir
|
||||||
atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
|
atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
|
||||||
@ -225,9 +219,6 @@ ufs2_label_head() {
|
|||||||
atf_set "descr" "fstyp(8) can read the label on a UFS v2 filesystem"
|
atf_set "descr" "fstyp(8) can read the label on a UFS v2 filesystem"
|
||||||
}
|
}
|
||||||
ufs2_label_body() {
|
ufs2_label_body() {
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
atf_check -s exit:0 mkdir dir
|
atf_check -s exit:0 mkdir dir
|
||||||
atf_check -s exit:0 -o ignore makefs -o version=2,label="foo" -Z -s 64m ufs.img dir
|
atf_check -s exit:0 -o ignore makefs -o version=2,label="foo" -Z -s 64m ufs.img dir
|
||||||
atf_check -s exit:0 -o inline:"ufs foo\n" fstyp -l ufs.img
|
atf_check -s exit:0 -o inline:"ufs foo\n" fstyp -l ufs.img
|
||||||
|
@ -106,10 +106,6 @@ D_flag_cleanup()
|
|||||||
atf_test_case F_flag cleanup
|
atf_test_case F_flag cleanup
|
||||||
F_flag_body()
|
F_flag_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
create_test_inputs
|
create_test_inputs
|
||||||
|
|
||||||
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
|
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
|
||||||
@ -129,10 +125,6 @@ F_flag_cleanup()
|
|||||||
atf_test_case from_mtree_spec_file cleanup
|
atf_test_case from_mtree_spec_file cleanup
|
||||||
from_mtree_spec_file_body()
|
from_mtree_spec_file_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
create_test_inputs
|
create_test_inputs
|
||||||
|
|
||||||
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
|
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
|
||||||
@ -154,10 +146,6 @@ from_mtree_spec_file_cleanup()
|
|||||||
atf_test_case from_multiple_dirs cleanup
|
atf_test_case from_multiple_dirs cleanup
|
||||||
from_multiple_dirs_body()
|
from_multiple_dirs_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
test_inputs_dir2=$TMPDIR/inputs2
|
test_inputs_dir2=$TMPDIR/inputs2
|
||||||
|
|
||||||
create_test_inputs
|
create_test_inputs
|
||||||
@ -180,10 +168,6 @@ from_multiple_dirs_cleanup()
|
|||||||
atf_test_case from_single_dir cleanup
|
atf_test_case from_single_dir cleanup
|
||||||
from_single_dir_body()
|
from_single_dir_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
create_test_inputs
|
create_test_inputs
|
||||||
|
|
||||||
atf_check -e empty -o not-empty -s exit:0 \
|
atf_check -e empty -o not-empty -s exit:0 \
|
||||||
@ -200,10 +184,6 @@ from_single_dir_cleanup()
|
|||||||
atf_test_case o_flag_version_1 cleanup
|
atf_test_case o_flag_version_1 cleanup
|
||||||
o_flag_version_1_body()
|
o_flag_version_1_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ffs_version=1
|
ffs_version=1
|
||||||
|
|
||||||
platform=$(uname)
|
platform=$(uname)
|
||||||
@ -236,10 +216,6 @@ o_flag_version_1_cleanup()
|
|||||||
atf_test_case o_flag_version_2 cleanup
|
atf_test_case o_flag_version_2 cleanup
|
||||||
o_flag_version_2_body()
|
o_flag_version_2_body()
|
||||||
{
|
{
|
||||||
if [ "$(atf_config_get ci false)" = "true" ]; then
|
|
||||||
atf_skip "https://bugs.freebsd.org/247425"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ffs_version=2
|
ffs_version=2
|
||||||
|
|
||||||
platform=$(uname)
|
platform=$(uname)
|
||||||
|
Loading…
Reference in New Issue
Block a user