Modify test to pass squeue pathname for use with private (test) installations.

testsuite/expect/test7.4

@@ -40,7 +40,7 @@ set exit_code     0
 set test_prog     "test$test_id.prog"
 
 # Note this appears as a single argv value to totalviewcli
-set bulk          "set issue_dgo false; dset TV::bulk_launch_enabled true; dset TV::bulk_launch_string {$srun -N%N -n%N --jobid=`test7.4.bash %t1` -l --input=none %B/tvdsvr%K -callback_host %H -callback_ports %L -set_pws %P -verbosity %V -working_directory %D %F}"
+set bulk          "set issue_dgo false; dset TV::bulk_launch_enabled true; dset TV::bulk_launch_string {$srun -N%N -n%N --jobid=`test7.4.bash $squeue %t1` -l --input=none %B/tvdsvr%K -callback_host %H -callback_ports %L -set_pws %P -verbosity %V -working_directory %D %F}"
 set no_bulk       "set issue_dgo false; dset TV::bulk_launch_enabled false"
 
 print_header $test_id

testsuite/expect/test7.4.bash

 #!/bin/sh
-# for a file containing a list of allocated nodes, get the slurm
-# jobid for the job running on that node for this user
+# Usage: <squeue path> <node list>
+# Returns SLURM job id allocated  to that node for that user
 #
-node=`head -n 1 $1`
+node=`head -n 1 $2`
 user=`id -un`
-jobid=`squeue -h -o %i -u $user -n $node`
+jobid=`$1 -h -o %i -u $user -n $node`
 echo $jobid