Merge branch 'master' :<

* 'master' of https://github.com/llnl/scr: update CORAL build steps in TESTING.csh fix bugs in LSF scr_env.in
LLNL · Feb 24, 2017 · 134df2f · 134df2f
2 parents 7fbb721 + 5d459cf
commit 134df2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/scripts/LSF/scr_env.in b/scripts/LSF/scr_env.in
@@ -74,7 +74,7 @@ if (defined $conf{user}) {
     my $hoststr = "";
     if (-r $hostfile) {
       # got a file, try to read it
-      my $hoststr = `cat $hostfile`;
+      $hoststr = `cat $hostfile`;
       if ($? != 0) {
         # failed to read file
         exit 1;
@@ -84,7 +84,7 @@ if (defined $conf{user}) {
     # build set of unique hostnames, one hostname per line
     chomp $hoststr;
     my @hosts = split('\n', $hoststr);
-    my %hosts_unique = {};
+    my %hosts_unique;
     foreach my $host (@hosts) {
       $hosts_unique{$host} = 1;
     }

diff --git a/testing/TESTING.csh b/testing/TESTING.csh
@@ -36,7 +36,7 @@ make dist
 #setenv CFLAGS "-g -O0 -Wall -Werror -DHIDE_TV"
 #setenv configopts "--with-scr-config-file=/etc/scr.conf --with-yogrt --with-mysql --with-dtcmp=./deps/install"
 setenv CFLAGS "-g -O0"
-setenv configopts "--with-scr-config-file=/etc/scr.conf  --with-machine-name=LSF"
+setenv configopts "--with-scr-config-file=/etc/scr.conf --with-machine-name=LSF --with-scr-cntl-base=/dev/shm --with-scr-cache-base=/dev/shm"
 setenv scrversion "scr-1.1.8"
 cd ${SCR_PKG}
 make distclean
@@ -84,11 +84,11 @@ mxterm 4 32 120
 # set up initial enviroment for testing
 setenv scrbin ${SCR_INSTALL}/bin
 setenv jobid `${scrbin}/scr_env --jobid`
-echo $jobid
-#setenv nodelist `${scrbin}/scr_env --nodes`
-#echo $nodelist
+echo "$jobid"
+setenv nodelist `${scrbin}/scr_env --nodes`
+echo "$nodelist"
 setenv downnode `${scrbin}/scr_glob_hosts -n 1 -h "$SLURM_NODELIST"`
-echo $downnode
+echo "$downnode"
 setenv prefix_files ".scr/flush.scr .scr/halt.scr .scr/nodes.scr"
 
 setenv LD_LIBRARY_PATH ${SCR_INSTALL}/lib:${SCR_PKG}/deps/install/lib