still need to build from source on ia64_sles_9 and sun4u_sol_5.9

[gssapi-openssh.git] / nmi / testscript

diff --git a/nmi/testscript b/nmi/testscript
index a668419197f04ad7fdfb137a71c3fd5c5a7c383f..c1f2c64c7aa714d3962622658fe8d9ea4e0662ce 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -1,11 +1,12 @@
 #!/bin/sh
 set -e # exit on any error
-if test "$NMI_PLATFORM" = "ia64_sles_9"; then
-  GT_INSTALLER=gt4.0.3-all-source-installer.tar.gz
-  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.3/installers/src/$GT_INSTALLER
+if test "$NMI_PLATFORM" = "ia64_sles_9" -o \
+        "$NMI_PLATFORM" = "sun4u_sol_5.9"; then
+  GT_INSTALLER=gt4.0.4-all-source-installer.tar.gz
+  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.4/installers/src/$GT_INSTALLER
 else
-  GT_INSTALLER=gt4.0.3-$NMI_PLATFORM-installer.tar.gz
-  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.3/installers/bin/$GT_INSTALLER
+  GT_INSTALLER=gt4.0.4-$NMI_PLATFORM-installer.tar.gz
+  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.4/installers/bin/$GT_INSTALLER
 fi
 GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus
 ZLIB_LOCATION=$_CONDOR_SCRATCH_DIR/zlib
@@ -39,12 +40,17 @@ make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
 cd ..
 echo ==================================================
-echo Building zlib-1.2.3...
-cd zlib-1.2.3
-./configure --prefix=$ZLIB_LOCATION
-make
-make install
-cd ..
+if test -d /prereq/zlib-1.2.3; then
+  ZLIB_LOCATION=/prereq/zlib-1.2.3
+  echo zlib found in $ZLIB_LOCATION
+else
+  echo Building zlib-1.2.3...
+  cd zlib-1.2.3
+  ./configure --prefix=$ZLIB_LOCATION
+  make
+  make install
+  cd ..
+fi
 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
@@ -63,13 +69,20 @@ if test -d openssh; then
   ./install-autotools $GLOBUS_LOCATION
   cd ..
   echo ==================================================
-  echo Building GSI-OpenSSH from CVS...
   cd openssh
-  autoreconf
-  ./configure --prefix=$GLOBUS_LOCATION \
-    --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
-    --with-zlib=$ZLIB_LOCATION \
-    --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
-  make install
+  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
+    echo Building GSI-OpenSSH from CVS trunk...
+    autoreconf
+    ./configure --prefix=$GLOBUS_LOCATION \
+      --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
+      --with-zlib=$ZLIB_LOCATION \
+      --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
+    make install
+  fi
 fi
 ) 2>&1 # we want stdout & stderr mixed in the output file