x86_fc_4 will be retired from NMI pool

[gssapi-openssh.git] / nmi / testscript

diff --git a/nmi/testscript b/nmi/testscript
index 5b488993f59a3143f27695b8588ab9c7c565f90e..d39ce0101cd1046142c616e3d3c3bbaea0792b2d 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -88,16 +88,17 @@ if test -d gssapi-openssh/openssh; then
       --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
       --with-zlib=$ZLIB_LOCATION \
       --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
-    make install
+    make install-nokeys # nonroot
   fi
   cd ../..
 fi
+rm -rf gt*-installer
 if test -f nightly.tar.gz; then
     echo ==================================================
     echo Installing GT CVS Trunk...
     GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus-trunk
     tar xfz nightly.tar.gz
-    cd gtTRUNK-all-source-installer
+    cd gt*-installer
     ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
                 --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
     make gsi-openssh install
@@ -137,7 +138,7 @@ if test -f nightly.tar.gz; then
                 --with-zlib=$ZLIB_LOCATION \
                 --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
             make clean
-            make install
+            make install-nokeys # nonroot
         fi
     fi
 fi