Tweaks for totalviewcli test. previous version failed if

the "squeue" used for testing was not first in the search
path or totalviewcli passed a full pathname of a node
(e.g. "linux123.llnl.gov" instead of "linux123"). Finally
totalview 7.1.1 is required on infiniband systems to run
(manually alter totalviewcli pathame in the globals file 
as needed).

testsuite/expect/test7.4

@@ -117,7 +117,8 @@ expect {
 		incr matches
 		exp_continue
 	}
-	-re "Loaded MPI.*($number).*" {
+	-re "Loaded MPI support.*" {
+		exec sleep 2
 		send "G\n"
 		exp_continue
 	}
@@ -129,8 +130,9 @@ expect {
 		incr no_capability
 		exp_continue
 	}
-	-re "Process 1 has exited" {
+	-re "Process 1 has exited.*" {
 		incr matches
+		exec sleep 2
 		send "quit\n"
 		exp_continue
 	}
@@ -193,7 +195,8 @@ expect {
 		incr matches
 		exp_continue
 	}
-	-re "Loaded MPI.*($number).*" {
+	-re "Loaded MPI support.*" {
+		exec sleep 2
 		send "G\n"
 		exp_continue
 	}
@@ -205,8 +208,9 @@ expect {
 		incr no_capability
 		exp_continue
 	}
-	-re "Process 1 has exited" {
+	-re "Process 1 has exited.*" {
 		incr matches
+		exec sleep 2
 		send "quit\n"
 		exp_continue
 	}

testsuite/expect/test7.4.sh

 #!/bin/sh
-# Usage: <squeue path> <node list>
+# Usage: <squeue path> <hostlist file>
 # Returns SLURM job id allocated  to that node for that user
+# Note: The hostlist file contains full pathnames that need to 
+#	be stripped to the hostname (e.g. "linux123.llnl.gov" 
+#	becomes "linux123" as an argument so squeue).
 #
-node=`head -n 1 $2`
+node=`head -n 1 $2 | cut -f 1 -d .`
 user=`id -un`
 jobid=`$1 -h -o %i -u $user -n $node`
 echo $jobid