diff --git a/xCAT-test/native/enablekdump_per_node.t b/xCAT-test/native/enablekdump_per_node.t index 2f051ffdc..56ff34451 100644 --- a/xCAT-test/native/enablekdump_per_node.t +++ b/xCAT-test/native/enablekdump_per_node.t @@ -12,7 +12,7 @@ use XCAT::Test::Sandbox qw(sandbox_root sandbox_run); plan skip_all => 'postscript targets Linux nodes' unless $^O eq 'linux'; my $postscripts = repo_path('xCAT/postscripts'); -BAIL_OUT('enablekdump and xcatlib.sh are required') +die('enablekdump and xcatlib.sh are required') unless -r "$postscripts/enablekdump" && -r "$postscripts/xcatlib.sh"; sub run_enablekdump { diff --git a/xCAT-test/native/getinstdisk_selection.t b/xCAT-test/native/getinstdisk_selection.t index e92768585..35bc8b1ae 100644 --- a/xCAT-test/native/getinstdisk_selection.t +++ b/xCAT-test/native/getinstdisk_selection.t @@ -12,9 +12,9 @@ use XCAT::Test::Sandbox qw(sandbox_root sandbox_run); use XCAT::Test::Template qw(template_database set_row render_template); plan skip_all => 'disk selection requires Linux namespaces' unless $^O eq 'linux'; -BAIL_OUT('run as root to create isolated dummy block devices') if $>; +die('run as root to create isolated dummy block devices') if $>; my $script = repo_path('xCAT-server/share/xcat/install/scripts/getinstdisk'); -BAIL_OUT("missing disk selector: $script") unless -r $script; +die("missing disk selector: $script") unless -r $script; my $database; sub selects { diff --git a/xCAT-test/native/sudoer_password_source.t b/xCAT-test/native/sudoer_password_source.t index 175eefd1f..7f761cc0c 100644 --- a/xCAT-test/native/sudoer_password_source.t +++ b/xCAT-test/native/sudoer_password_source.t @@ -13,9 +13,9 @@ use XCAT::Test::Sandbox qw(sandbox_root sandbox_run); plan skip_all => 'postscript targets Linux nodes' unless $^O eq 'linux'; my $postscripts = repo_path('xCAT/postscripts'); -BAIL_OUT('sudoer and xcatlib.sh are required') unless -r "$postscripts/sudoer" && -r "$postscripts/xcatlib.sh"; +die('sudoer and xcatlib.sh are required') unless -r "$postscripts/sudoer" && -r "$postscripts/xcatlib.sh"; my $visudo = -x '/usr/sbin/visudo' ? '/usr/sbin/visudo' : '/sbin/visudo'; -BAIL_OUT('install sudo for the native visudo parser') unless -x $visudo; +die('install sudo for the native visudo parser') unless -x $visudo; sub field_reply { my ($field) = @_;