test CVS version too

diff --git a/nmi/README b/nmi/README
index 8a045a66a45d53d9e323656e41f02fe3c82e3a39..d602aee565ac30bf84bccbf84b766af5960615c6 100644 (file)
--- a/nmi/README
+++ b/nmi/README
@@ -8,11 +8,12 @@ To submit a test build:
   $ cd nmi
   $ nmi_submit -notify-fail-only cmdfile
 
-The build platforms are specified in cmdfile.
+The build platforms and inputs are specified in cmdfile.
 The nmi_platforms script will show the current list of available
 platforms if run on grandcentral.
-The gsi_openssh_bundle-*-src.tar.gz location must be specified in
-gsissh-src.ftp.
+If testing a GPT bundle, the gsi_openssh_bundle-*-src.tar.gz location
+must be specified in gsissh-src.ftp.
+Define cvs_tag in gsissh-src.cvs to build from a specific CVS tag.
 Otherwise, all the intelligence is in testscript.
 In particular, the GT installers corresponding to the chosen platforms
 must be set in testscript.

diff --git a/nmi/cmdfile b/nmi/cmdfile
index d781bab58c40d4b47bbe014fd5ce93c9f2fc7e67..99f057d5759e96efa2bd9ea37ec9a5f1e6d464af 100644 (file)
--- a/nmi/cmdfile
+++ b/nmi/cmdfile
@@ -3,7 +3,7 @@ component = GSI-OpenSSH
 component_version = 3.9
 description = pre-release test builds
 run_type = build
-inputs = gsissh-src.ftp, gsissh-nmi.cvs, zlib-src.ftp
+inputs = gsissh-src.cvs, gsissh-src.ftp, gsissh-nmi.cvs, zlib-src.ftp
 remote_task = nmi/testscript
 platforms = ia64_sles_8, ia64_sles_9, ppc_aix_5.2, ppc_macos_10.4, sun4u_sol_5.9, x86_64_rhas_3, x86_64_rhas_4, x86_deb_3.1, x86_fc_3, x86_fc_4, x86_rhas_3, x86_rhas_4
 #prereqs = zlib-1.2.3

diff --git a/nmi/testscript b/nmi/testscript
index 18b34f2c9b104e0eed8a9c785b67f7a2b062291b..24a0c13bb0f19cd79ca76faf7458cce0a5b77aa0 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -46,11 +46,22 @@ make
 make install
 cd ..
 echo ==================================================
-flavor=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
-echo GPT flavor is $flavor.  Installing globus_core.
-gpt-build -nosrc $flavor
+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.
+gpt-build -nosrc $GLOBUS_FLAVOR_NAME
 echo ==================================================
-echo Building GSI-OpenSSH...
-gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $flavor \
-  GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
+if test -f gsi_openssh_bundle-*.tar.gz; then
+  echo Building GSI-OpenSSH GPT bundle...
+  gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
+    GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
+fi
+if test -d openssh; then
+  echo Building GSI-OpenSSH from CVS...
+  cd openssh
+  make -f Makefile.in distprep
+  ./configure --prefix=$GLOBUS_LOCATION \
+    --with-globus-flavor=$GLOBUS_FLAVOR_NAME
+  make install
+fi
 ) 2>&1 # we want stdout & stderr mixed in the output file