[DAPL2] added requirement and code to enforce using delayed env. var expansion. Used...

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1348 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/ulp/dapl2/test/dapltest/scripts/dt-cli.bat b/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
index 6d1ab43..820d756 100644 (file)
--- a/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
+++ b/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
@@ -5,6 +5,15 @@ rem
 \r
 SETLOCAL\r
 \r
+rem cmd.exe /V:on (delayed environment variable expansion) is required!\r
+rem restart with /V:on if necessary\r
+set F=on\r
+set F=off\r
+if not "!F!" == "off" (\r
+   %comspec% /E:on /V:on /C %0 %1 %2 %3 %4\r
+   exit /B %ERRORLEVEL%\r
+)\r
+\r
 rem set DAT_OVERRIDE=D:\dapl2\dat.conf\r
 rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe)\r
 \r
@@ -84,48 +93,54 @@ rem add '-d' for debug output.
 )\r
 \r
 if "%T%" == "trans" (\r
-    echo Transaction test - 8192 iterations, 1 thread, SR 4KB buffers\r
+    echo %T%: Transaction test - 8192 iterations, 1 thread, SR 4KB buffers\r
     %DT% -T T -s %S% -D %D% -i 8192 -t 1 -w 1 client SR 4096 server SR 4096\r
+    echo Finished %T%: Transaction test - 8192 iterations, 1 thread, SR 4KB buffers\r
     exit /B\r
 )\r
 \r
 if "%T%" == "transm" (\r
-    echo Multiple RW, RR, SR transactions, 4096 iterations\r
-    %DT% -T T -P -t 1 -w 1 -i 4096 -s %S% -D %D% client RW  4096 1 server RW  2048 4  server RR  1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f\r
+    echo %T%: Multiple RW, RR, SR transactions, 4096 iterations\r
+    %DT% -T T -P -t 1 -w 1 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4  server RR  1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f\r
+    echo Finished %T%: Multiple RW, RR, SR transactions, 4096 iterations\r
     exit /B\r
 )\r
 \r
 if "%T%" == "transt" (\r
-    echo Multi-threaded[4] Transaction test - 4096 iterations, 1 thread, SR 4KB buffers\r
+    echo %T%: Threads[4] Transaction test - 4096 iterations, 1 thread, SR 4KB buffers\r
    %DT% -T T -s %S% -D %D% -i 4096 -t 4 -w 1 client SR 8192 3 server SR 8192 3\r
+    echo Finished %T%: Threads[4] Transaction test - 4096 iterations, 1 thread, SR 4KB buffers\r
     exit /B\r
 )\r
 \r
 if "%T%" == "transme" (\r
-    echo Multiple endpoints[4] transactions [RW, RR, SR], 4096 iterations\r
+    echo %T%: 1 Thread Endpoints[4] transactions [RW, RR, SR], 4096 iterations\r
     %DT% -T T -P -t 1 -w 4 -i 4096 -s %S% -D %D% client RW  4096 1 server RW  2048 4  server RR  1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f\r
+    echo Finished %T%: 1 Thread Endpoints[4] transactions [RW, RR, SR], 4096 iterations\r
     exit /B\r
 )\r
 \r
 if "%T%" == "transmet" (\r
-    echo Multiple: threads[2] endpoints[4] transactions[RW, RR, SR], 4096 iterations\r
+    echo %T%: Threads[2] Endpoints[4] transactions[RW, RR, SR], 4096 iterations\r
     %DT% -T T -P -t 2 -w 4 -i 4096 -s %S% -D %D% client RW  4096 1 server RW  2048 4  server RR  1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f\r
+    echo Finished %T%: Threads[2] Endpoints[4] transactions[RW, RR, SR], 4096 iterations\r
     exit /B\r
 )\r
 \r
 if "%T%" == "transmete" (\r
-    echo Multiple: threads[4] endpoints[4] transactions[RW, RR, SR], 8192 iterations\r
+    echo %T%: Threads[4] Endpoints[4] transactions[RW, RR, SR], 8192 iterations\r
     %DT% -T T -P -t 2 -w 4 -i 8192 -s %S% -D %D% client RW  4096 1 server RW  2048 4  server RR  1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f\r
+    echo Finished %T%: Threads[4] Endpoints[4] transactions[RW, RR, SR], 8192 iterations\r
     exit /B\r
 )\r
 \r
 if "%T%" == "EPA" (\r
     FOR /L %%j IN (2,1,5) DO (\r
         FOR /L %%i IN (1,1,5) DO (\r
-             echo Multi: Threads[%%j] endpoints[%%i] Send/Recv test - 4096 iterations, 3 8K segs\r
+             echo %T%: Multi: Threads[%%j] Endpoints[%%i] Send/Recv test - 4096 iterations, 3 8K segs\r
              %DT% -T T -s %S% -D %D% -i 4096 -t %%j -w %%i client SR 8192 3 server SR 8192 3\r
              if ERRORLEVEL 1 exit /B \r
-             echo Multi: Threads[%%j] endpoints[%%i] Send/Recv test - 4096 iterations, 3 8K segs\r
+             echo %T%: Multi: Threads[%%j] Endpoints[%%i] Send/Recv test - 4096 iterations, 3 8K segs\r
              timeout /T 3\r
         )\r
     )\r
@@ -133,21 +148,27 @@ if "%T%" == "EPA" (
 )\r
 \r
 if "%T%" == "EP" (\r
-    echo Multi: Threads[5] endpoints[7] Send/Recv test - 4096 iterations, 3 8K segs\r
-    %DT% -T T -s %S% -D %D% -i 4096 -t 5 -w 7 client SR 8192 3 server SR 8192 3\r
-    echo Multi: Threads[5] endpoints[7] Send/Recv test - 4096 iterations, 3 8K segs\r
+    set TH=4\r
+    set EP=5\r
+    echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
+    %DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3\r
+    echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
     exit /B \r
 )\r
 \r
 if "%T%" == "threads" (\r
-    echo Multi Threaded[6] Send/Recv test - 4096 iterations, 3 8K segs\r
+    echo %T%: Multi Threaded[6] Send/Recv test - 4096 iterations, 3 8K segs\r
     %DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 1 client SR 8192 3 server SR 8192 3\r
+    echo Finished %T%: Multi Threaded[6] Send/Recv test - 4096 iterations, 3 8K segs\r
     exit /B\r
 )\r
 \r
 if "%T%" == "threadsm" (\r
-    echo Multi: Threads[6] endpoints[6] Send/Recv test - 4096 iterations, 3 8K segs\r
+    set TH=4\r
+    set EP=5\r
+    echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
     %DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 6 client SR 8192 3 server SR 8192 3\r
+    echo Finished %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
     exit /B\r
 )\r
 \r
@@ -158,18 +179,23 @@ if "%T%" == "perf" (
 )\r
 \r
 if "%T%" == "rdma-read" (\r
+    echo %T% 4 32K segs\r
     %DT% -T P -s %S% -D %D% -i 4096 RR 32768 4\r
+    echo Finished %T% 4 32K segs\r
     exit /B\r
 )\r
 \r
 if "%T%" == "rdma-write" (\r
+    echo %T% 4 32K segs\r
     %DT% -T P -s %S% -D %D% -i 4096 RW 32768 4\r
+    echo Finished %T% 4 32K segs\r
     exit /B\r
 )\r
 \r
 if "%T%" == "bw" (\r
-    echo bandwidth 65K msgs\r
+    echo bandwidth 4096 iterations of 2 65K mesgs\r
     %DT% -T P -s %S% -D %D% -i 4096 -p 16 -m p RW 65536 2 \r
+    echo Finished bandwidth 4096 iterations of 2 65K mesgs\r
     exit /B\r
 )\r
 \r
@@ -215,44 +241,56 @@ if "%T%" == "regression" (
          call %0 %1 trans\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 perf\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 threads\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 threadsm\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 transm\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 transt\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 transme\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 transmet\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 transmete\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 rdma-write\r
          if ERRORLEVEL 1 exit /B\r
          timeout /T 3\r
 \r
+         echo in Loop %%i\r
          call %0 %1 rdma-read\r
          if ERRORLEVEL 1 exit /B\r
 \r
+         echo in Loop %%i\r
          call %0 %1 bw\r
          if ERRORLEVEL 1 exit /B \r
 \r
+         echo in Loop %%i\r
          call %0 %1 EP\r
          if ERRORLEVEL 1 exit /B\r
 \r
-         echo %%i %T% loops completed.\r
+         echo Finished loop %%i, %T% loops completed.\r
          timeout /T 4\r
     )\r
     exit /B\r
@@ -330,7 +368,7 @@ echo   where testname
 echo     stop - request DAPLtest server to exit.\r
 echo     conn - simple connection with limited data transfer\r
 echo     EP - Multiple EndPoints(7) and Threads(5) Transactions\r
-echo     EPA - Increment EndPoints[1..9] while increasing threads[1-8]\r
+echo     EPA - Increment EndPoints[1..5] while increasing threads[1-5]\r
 echo     trans - single transaction test\r
 echo     transm - transaction test: multiple transactions [RW SND, RDMA]\r
 echo     transt - transaction test: multi-threaded\r