X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/4d997295b5a5126c44b9f436d771fe40c41a5661..232692da08356bd706e108e677239a24a2c5f43b:/nmi/testscript

diff --git a/nmi/testscript b/nmi/testscript
index 887464e..37b8a19 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -27,19 +27,6 @@ echo `which curl`
 echo `which ncftpget`
 echo `which ftp`
 echo ==================================================
-echo Installing Globus Toolkit...
-if test -x `which wget`; then
-  wget $GT_INSTALLER_URL
-else
-  curl $GT_INSTALLER_URL > $GT_INSTALLER
-fi
-tar xfz $GT_INSTALLER
-cd gt*-installer
-./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose"
-make gsi-openssh install
-. $GLOBUS_LOCATION/etc/globus-user-env.sh
-cd ..
-echo ==================================================
 if test -d /prereq/zlib-1.2.3; then
   ZLIB_LOCATION=/prereq/zlib-1.2.3
   echo zlib found in $ZLIB_LOCATION
@@ -52,6 +39,20 @@ else
   cd ..
 fi
 echo ==================================================
+echo Installing Globus Toolkit...
+if test -x `which wget`; then
+  wget $GT_INSTALLER_URL
+else
+  curl $GT_INSTALLER_URL > $GT_INSTALLER
+fi
+tar xfz $GT_INSTALLER
+cd gt*-installer
+./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
+            --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
+make gsi-openssh install
+. $GLOBUS_LOCATION/etc/globus-user-env.sh
+cd ..
+echo ==================================================
 GLOBUS_FLAVOR_NAME=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
 export GLOBUS_FLAVOR_NAME
 echo GPT GLOBUS_FLAVOR_NAME is $GLOBUS_FLAVOR_NAME.  Installing globus_core.
@@ -84,13 +85,16 @@ if test -d openssh; then
       --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
     make install
   fi
+  cd ..
 fi
-if test -d gtTRUNK-all-source-installer; then
+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
-    ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose"
+    ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
+                --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
     make gsi-openssh install
     . $GLOBUS_LOCATION/etc/globus-user-env.sh
     cd ..
@@ -114,7 +118,6 @@ if test -d gtTRUNK-all-source-installer; then
         cd openssh
         if test -f make_gpt_dist; then
             echo Building GSI-OpenSSH GPT package from CVS...
-            ./make_gpt_dist
             gpt-build -force -verbose gsi_openssh-*.tar.gz $GLOBUS_FLAVOR_NAME \
                 GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
         else
@@ -128,4 +131,5 @@ if test -d gtTRUNK-all-source-installer; then
             make install
         fi
     fi
+fi
 ) 2>&1 # we want stdout & stderr mixed in the output file