use 'make install-nokeys' because 'make install' requires root now

[gssapi-openssh.git] / nmi / testscript

diff --git a/nmi/testscript b/nmi/testscript
index 5f18844e0846ae66edff44d4c17fdf501302067e..658c533bf92ea01bdf6cb3470a2c7583f3f3625c 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -6,6 +6,27 @@ LOGNAME=$USER
 X509_CERT_DIR=$GLOBUS_LOCATION/share/certificates
 export GLOBUS_LOCATION LOGNAME X509_CERT_DIR
 (
+if test -n "${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+elif test -n "${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+fi
+if test -n "${LD_LIBRARY_PATH}" -a -z "${LIBPATH}"; then
+    LIBPATH=$LD_LIBRARY_PATH
+    export LIBPATH
+fi
 echo ==================================================
 echo Environment variables:
 env
@@ -34,6 +55,9 @@ make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
 cd ..
 echo ==================================================
+echo Environment variables:
+env
+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.
@@ -64,7 +88,7 @@ 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
@@ -80,6 +104,9 @@ if test -f nightly.tar.gz; then
     . $GLOBUS_LOCATION/etc/globus-user-env.sh
     cd ..
     echo ==================================================
+    echo Environment variables:
+    env
+    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.
@@ -110,7 +137,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