set $SHELL to override whatever your shell sets

(cherry picked from commit 4f8f508e04ab8f4267b6950e36745c1f3f10ada9)

diff --git a/src/tests/run-suite.pl b/src/tests/run-suite.pl
index f9b56d28e06b374e496401147ca55544565c167d..0f93cef64050194c2fbbeebd17167dde3bf7232d 100755 (executable)
--- a/src/tests/run-suite.pl
+++ b/src/tests/run-suite.pl
@@ -9,6 +9,7 @@ use OpenAFS::ConfigUtils;
 use OpenAFS::Dirpath;
 use OpenAFS::OS;
 use OpenAFS::Auth;
+use File::Copy;
 use Getopt::Long;
 use vars qw($admin $server $cellname $cachesize $part
           $shutdown_needed $csdb);
@@ -70,12 +71,6 @@ while(<MOUNT>) {
 }
 close MOUNT;
 
-unless ( -f "$openafsdirpath->{'afsconfdir'}/KeyFile") {
-  print "You do not have an AFS keyfile.  Please create this using asetkey from openafs-krb5 or 
-the bos addkey command";
-  exit(1);
-}
-
 print "If the fileserver is not running, this may hang for 30 seconds.\n";
 run("$openafsinitcmd->{'filesrv-stop'}");
 $server = `hostname`;
@@ -91,12 +86,23 @@ die "Please specify a cellname\n" unless $cellname;
 
 unlink "$openafsdirpath->{'viceetcdir'}/CellServDB";
 unlink "$openafsdirpath->{'viceetcdir'}/ThisCell";
+if ($cellname eq "this.thirty.nine.character.name.for.sed") {
+  copy("kaserver.DB0","$openafsdirpath->{'afsdbdir'}/kaserver.DB0");
+  copy("kaserver.DBSYS1","$openafsdirpath->{'afsdbdir'}/kaserver.DBSYS1");
+  copy("KeyFile","$openafsdirpath->{'afsconfdir'}/KeyFile");
+}
+
+unless ( -f "$openafsdirpath->{'afsconfdir'}/KeyFile") {
+  print "You do not have an AFS keyfile.  Please create this using asetkey from openafs-krb5 or the bos addkey command";
+  exit(1);
+}
 
 my $lcell = "${cellname}";
 
 #let bosserver create symlinks
 run("$openafsinitcmd->{'filesrv-start'}");
 unwind("$openafsinitcmd->{'filesrv-stop'}");
+unwind("/bin/rm -f $openafsdirpath->{'afslocaldir'}/BosConfig");
 $shutdown_needed = 1;
 
 open(THISCELL, ">$openafsdirpath->{'afsconfdir'}/ThisCell");
@@ -119,16 +125,22 @@ print PRDB "$admin 128/20 1 -204 -204\n";
 print PRDB "system:administrators 130/20 -204 -204 -204\n";
 print PRDB" $admin 1\n";
 close PRDB;
-unwind( "rm $openafsdirpath->{'afsdbdir'}/prdb* ");
+unwind( "rm $openafsdirpath->{'afsdbdir'}/prdb.DB* ");
 # Start up ptserver and vlserver
 run("$openafsdirpath->{'afssrvbindir'}/bos create $server ptserver simple $openafsdirpath->{'afssrvlibexecdir'}/ptserver -localauth");
 unwind("$openafsdirpath->{'afssrvbindir'}/bos delete $server ptserver -localauth");
 unwind("$openafsdirpath->{'afssrvbindir'}/bos stop $server ptserver -localauth -wait");
 
 run("$openafsdirpath->{'afssrvbindir'}/bos create $server vlserver simple $openafsdirpath->{'afssrvlibexecdir'}/vlserver -localauth");
+unwind( "rm $openafsdirpath->{'afsdbdir'}/vldb.DB* ");
 unwind("$openafsdirpath->{'afssrvbindir'}/bos delete $server vlserver -localauth");
 unwind("$openafsdirpath->{'afssrvbindir'}/bos stop $server vlserver -localauth -wait");
 
+run("$openafsdirpath->{'afssrvbindir'}/bos create $server kaserver simple $openafsdirpath->{'afssrvlibexecdir'}/kaserver -localauth");
+unwind( "rm $openafsdirpath->{'afsdbdir'}/kaserver.DB* ");
+unwind("$openafsdirpath->{'afssrvbindir'}/bos delete $server kaserver -localauth");
+unwind("$openafsdirpath->{'afssrvbindir'}/bos stop $server kaserver -localauth -wait");
+
 run( "$openafsdirpath->{'afssrvbindir'}/bos create $server fs fs ".
      "-cmd $openafsdirpath->{'afssrvlibexecdir'}/fileserver ".
      "-cmd $openafsdirpath->{'afssrvlibexecdir'}/volserver ".
@@ -142,8 +154,12 @@ sleep(90);
 print "done.\n";
 # Past this point we want to control when bos shutdown happens
 $shutdown_needed = 0;
+$part = "a" unless $part;
+
 unwind( "$openafsdirpath->{'afssrvbindir'}/bos shutdown $server -localauth ");
-run("$openafsdirpath->{'afssrvsbindir'}/vos create $server a root.afs -localauth");
+run("$openafsdirpath->{'afssrvsbindir'}/vos create $server $part root.afs -localauth");
+unwind("$openafsdirpath->{'afssrvsbindir'}/vos remove $server $part root.afs -localauth");
+
 # bring up client
 
 $cachesize = $rl->readline("What size cache (in 1k blocks)? ") unless $cachesize;
@@ -176,8 +192,6 @@ print  "Please fix whatever problem kept it from running.\n";
 }
 unwind("$openafsinitcmd->{'client-stop'}");
 
-$part = "a" unless $part;
-
 &OpenAFS::Auth::authadmin();
 
 run("$openafsdirpath->{'afssrvbindir'}/fs sa /afs system:anyuser rl");

diff --git a/src/tests/run-tests.in b/src/tests/run-tests.in
index 3e8ba3a216ffc0ea4bda41333cba47d1352e498f..844a6bcb3737a09ae3865f751e549b3cee0f5a7a 100755 (executable)
--- a/src/tests/run-tests.in
+++ b/src/tests/run-tests.in
@@ -11,6 +11,7 @@ host=@host@
 RUNAS=nobody
 FS=@afssrvbindir@/fs
 export FS
+export SHELL
 
 AFSROOT=${AFSROOT-/afs}
 export AFSROOT