mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 06:50:12 +00:00
tests: Cleanup auth/writeoldkey-t temp directory
Commit cbc5c4b51f
'tests: Modernize writekeyfile.c' introduced
writeoldkey-t and specified CLEANUP for its afs_XXXXX temporary work
directory. However, Perl will not perform CLEANUP if the script is
still in that directory at exit. Therefore writeoldkey-t leaves behind
an afs_XXXXX temp directory for each run.
Modify writeoldkey-t to cd back into 'tests' before exit, so that
CLEANUP will work as intended.
[mmeffie: save the cwd before cd to the temp dir]
Change-Id: Ida723f9bfca05cc96acf189156d13c8607d210f4
Reviewed-on: https://gerrit.openafs.org/15724
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
This commit is contained in:
parent
ac9d766b47
commit
fc5341d7ee
@ -7,7 +7,7 @@ use lib $ENV{C_TAP_SOURCE} . "/tests-lib/perl5";
|
||||
use afstest qw(src_path obj_path);
|
||||
use Test::More;
|
||||
use File::Temp qw/tempdir/;
|
||||
use Cwd qw/abs_path/;
|
||||
use Cwd qw/abs_path getcwd/;
|
||||
use File::Compare;
|
||||
use Sys::Hostname;
|
||||
use Socket;
|
||||
@ -27,6 +27,7 @@ $cmd = abs_path($cmd);
|
||||
my $keyfile = src_path("tests/auth/KeyFile.short");
|
||||
$keyfile = abs_path($keyfile);
|
||||
|
||||
my $origdir = getcwd();
|
||||
my $dir = tempdir('afs_XXXXXX', CLEANUP => 1);
|
||||
|
||||
chdir($dir)
|
||||
@ -37,3 +38,7 @@ system($cmd) == 0
|
||||
|
||||
ok(compare("KeyFile", $keyfile) == 0,
|
||||
"writekeyfile generates expected KeyFile");
|
||||
|
||||
# The cleanup handler needs to run in the original directory.
|
||||
chdir($origdir)
|
||||
or die("chdir $origdir failed: $?");
|
||||
|
Loading…
Reference in New Issue
Block a user