mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Improve handling with system state

Browse Source 
- Always unlink $cmd after exit via END block.
- The tests don't function well if kern.geom.debugflags != 0. Save debugflags,
  then restore them at the end of the test.

MFC after:	1 month
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-06-10 20:56:31 +00:00
parent 990e7dcfdc
commit 22184bfa63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=319806
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/regression/geom_gpt/gctl_test.t
View File

@ -144,7 +144,17 @@ my $out = basename($cmd) . ".out";
# Make sure we have permission to use gctl...
if (`$cmd` =~ "^FAIL Permission denied") {
print "1..0 # SKIP insufficient permissions\n";
unlink $cmd;
exit 0;
}
my $debugflags_oid = 'kern.geom.debugflags';
chomp(my $old_geom_debugflags = `sysctl -n $debugflags_oid`);
if ($? != 0) {
print "1..0 # SKIP could not query $debugflags_oid\n";
exit 0;
}
if (system("sysctl $debugflags_oid=0") != 0) {
print "1..0 # SKIP could not set $debugflags_oid=0\n";
exit 0;
}
@ -227,4 +237,7 @@ foreach my $key (sort keys %steps) {
}
$nr += 1;
}
exit 0;
END {
system("sysctl $debugflags_oid=$old_geom_debugflags");
unlink($cmd);
}