dapltest: windows scripts updated

Support added for provider specification and general simplification of internal workings.

Signed-off-by: Stan Smith <stan.smith@intel.com>

diff --git a/test/dapltest/scripts/dt-cli.bat b/test/dapltest/scripts/dt-cli.bat
index 9f2284a143ca3476250fa7651e20e3c11087ed14..9cbb202137e051fd9aa92f051b606fb82e548931 100644 (file)
--- a/test/dapltest/scripts/dt-cli.bat
+++ b/test/dapltest/scripts/dt-cli.bat
@@ -30,15 +30,16 @@ if NOT EXIST %PF%\dapl2test.exe (
 set DT=dapl2test.exe\r
 rem     To debug dapl2test - use dapl2testd.exe with ibnic0v2d\r
 \r
+rem setup DAPL provider name: translate shorthand name or use name from dat.conf.\r
+rem if DAPL provider name is incorrect, DAPL will fail correctly.\r
 \r
 if "%1" == "" goto usage\r
 if "%1" == "ibal"  set D=ibnic0v2\r
+if "%1" == "ibal0" set D=ibnic0v2\r
+if "%1" == "ibal1" set D=ibnic1v2\r
 if "%1" == "scm"   set D=ibnic0v2-scm\r
 if "%1" == "cma"   set D=ibnic0v2-cma\r
-if "%D%" == "" (\r
-    echo Invalid DAPL Provider name '%1' ?\r
-    goto usage\r
-)\r
+if "%D%" == ""     set D=%1\r
 \r
 rem DaplTest server hostname\r
 if "%2" == "" goto usage\r
@@ -48,7 +49,7 @@ rem Which test ?
 if "%3" == "" goto usage\r
 set T=%3\r
 \r
-set LPS=3\r
+set LPS=5\r
 \r
 rem Enable DEBUG?\r
 \r
@@ -64,6 +65,8 @@ rem    set DAT_DBG_TYPE=0x1
 rem    set DAT_DBG_LEVEL=1\r
 )\r
 \r
+if "%4" == "-Q" ( set QUIET=1 ) else ( set QUIET=0 )\r
+\r
 rem %DT% -T T -V -t 2 -w 2 -i 1000111 -s %S% -D %D% \r
 rem           client RW  4096 1    server RW  2048 4 \r
 rem           client RR  1024 2    server RR  2048 2 \r
@@ -83,61 +86,47 @@ if "%T%" == "bench" (
 )\r
 \r
 if "%T%" == "conn" (\r
-rem Connectivity test - client sends one buffer with one 4KB segments, one time.\r
-rem add '-d' for debug output.\r
+    rem Connectivity test - client sends one buffer with one 4KB segments, one time.\r
+    rem add '-d' for debug output.\r
     echo Simple Connectivity test\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T T -s %S% -D %D% -i 1 -t 1 -w 1 client SR 4096 server SR 4096\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 1 -t 1 -w 1 client SR 4096 server SR 4096\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "trans" (\r
     echo %T%: Transaction test - 8192 iterations, 1 thread, SR 4KB buffers\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T T -s %S% -D %D% -i 8192 -t 1 -w 1 client SR 4096 server SR 4096\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 8192 -t 1 -w 1 client SR 4096 server SR 4096\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "transm" (\r
     echo %T%: Multiple RW, RR, SR transactions, 4096 iterations\r
-       set STIME=!DATE! !TIME!\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
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%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
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "transt" (\r
     echo %T%: Threads[4] Transaction test - 4096 iterations, 1 thread, SR 4KB buffers\r
-       set STIME=!DATE! !TIME!\r
-   %DT% -T T -s %S% -D %D% -i 4096 -t 4 -w 1 client SR 8192 3 server SR 8192 3\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t 4 -w 1 client SR 8192 3 server SR 8192 3\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "transme" (\r
     echo %T%: 1 Thread Endpoints[4] transactions [RW, RR, SR], 4096 iterations\r
-       set STIME=!DATE! !TIME!\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
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%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
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "transmet" (\r
     echo %T%: Threads[2] Endpoints[4] transactions[RW, RR, SR], 4096 iterations\r
-       set STIME=!DATE! !TIME!\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
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%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
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "transmete" (\r
     echo %T%: Threads[4] Endpoints[4] transactions[RW, RR, SR], 8192 iterations\r
-       set STIME=!DATE! !TIME!\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
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%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
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "EPA" (\r
@@ -159,76 +148,58 @@ if "%T%" == "EP" (
     set TH=4\r
     set EP=3\r
     echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "threads" (\r
     echo %T%: Multi Threaded[6] Send/Recv test - 4096 iterations, 3 8K segs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 1 client SR 8192 3 server SR 8192 3\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 1 client SR 8192 3 server SR 8192 3\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "threadsm" (\r
     set TH=5\r
     set EP=3\r
     echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "perf" (\r
     rem echo Performance test\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P %DBG% -s %S% -D %D% -i 2048 RW 4096 2\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P %DBG% -s %S% -D %D% -i 2048 RW 4096 2\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "rdma-read" (\r
     echo %T% 4 32K segs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P -s %S% -D %D% -i 4096 RR 32768 4\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P -s %S% -D %D% -i 4096 RR 32768 4\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "rdma-write" (\r
     echo %T% 4 32K segs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P -s %S% -D %D% -i 4096 RW 32768 4\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P -s %S% -D %D% -i 4096 RW 32768 4\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "bw" (\r
     echo bandwidth 4096 iterations of 2 65K mesgs\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P -s %S% -D %D% -i 4096 -p 16 -m p RW 65536 2 \r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P -s %S% -D %D% -i 4096 -p 16 -m p RW 65536 2 \r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "latb" (\r
     echo latency test - block for completion events\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P -s %S% -D %D% -i 8192 -p 1 -m b RW 4 1\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P -s %S% -D %D% -i 8192 -p 1 -m b RW 4 1\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "latp" (\r
     echo latency test - poll completion events\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T P -s %S% -D %D% -i 8192 -p 1 -m p RW 4 1\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    set CMD=%DT% -T P -s %S% -D %D% -i 8192 -p 1 -m p RW 4 1\r
+    goto xcmd\r
 )\r
 \r
 if "%T%" == "lim" (\r
@@ -259,7 +230,7 @@ if "%T%" == "regression" (
     FOR /L %%i IN (1,1,!LPS!) DO (\r
        for %%r in ( !RT! ) do (\r
            echo loop %%i - start test %%r\r
-           call %0 %1 %%r\r
+           call %0 %1 %2 %%r\r
            if %ERRORLEVEL% GTR 1 (\r
                echo Error %ERRORLEVEL% in regression test %%r\r
                exit /B %ERRORLEVEL%\r
@@ -337,10 +308,8 @@ if "%T%" == "interop" (
 )\r
 \r
 if "%T%" == "stop" (\r
-       set STIME=!DATE! !TIME!\r
-    %DT% -T Q -s %S% -D %D%\r
-       set ETIME=!DATE! !TIME!\r
-    goto xit\r
+    %DT% -T Q -s %S% -D %D% > nul\r
+    goto rxt\r
 )\r
 \r
 :usage\r
@@ -350,7 +319,7 @@ echo usage: dt-cli dapl-provider dt-svr-hostname [testname [-D]]
 echo.\r
 echo where:\r
 echo.\r
-echo  dapl-provider - ibal scm cma\r
+echo  dapl-provider: ibal, scm, cma or %SystemDrive%\DAT\dat.conf DAPL-provider name.\r
 echo.\r
 echo  dt-svr-hostname - IPv4 hostanme where the DaplTest server is running\r
 echo.\r
@@ -378,6 +347,18 @@ echo    regression {loopCnt,default=%LPS%} - regression + stress.
 echo    interop {loopCnt,default=%LPS%} - 2007 OFA interoperability event tests.\r
 goto rxt\r
 \r
+rem Execute the single daplest Command (CMD), observe -Q switch\r
+:xcmd\r
+    set STIME=!DATE! !TIME!\r
+    if %QUIET% EQU 1 (\r
+        %CMD% > nul\r
+    ) else (\r
+        %CMD%\r
+    )\r
+    set ETIME=!DATE! !TIME!\r
+\r
+    rem fall thru...\r
+\r
 :xit\r
 \r
 if %ERRORLEVEL% EQU 0 (\r

diff --git a/test/dapltest/scripts/dt-svr.bat b/test/dapltest/scripts/dt-svr.bat
index a774aac1de3062ed39833f73b92d6aff6816245c..1d3760d037a3e72bda7cc69a9967a0ead230eb4b 100644 (file)
--- a/test/dapltest/scripts/dt-svr.bat
+++ b/test/dapltest/scripts/dt-svr.bat
@@ -25,19 +25,16 @@ rem which Dapl provider?
 if "%1" == "" (\r
     echo usage: dt-svr dapl-provider [ -D [dbg-bit-mask] ]\r
     echo.\r
-    echo Where: dapl-provider can be [ ibal, scm, cma ]\r
+    echo Where: dapl-provider can be [ ibal, scm, cma or %SystemDrive%\DAT\dat.conf provider name ]\r
     exit /B 1\r
 )\r
 \r
 if "%1" == "ibal"   set DEV=ibnic0v2\r
 if "%1" == "scm"    set DEV=ibnic0v2-scm\r
 if "%1" == "cma"    set DEV=ibnic0v2-cma\r
-if "%DEV%" == "" (\r
-    echo Invalid DAPL Provider name '%1', see %SystemDrive%\DAT\dat.conf ?\r
-    goto usage\r
-)\r
+if "%DEV%" == ""    set DEV=%1\r
 \r
-rem '-D' enables full debug output\r
+rem '-D' enables full debug output?\r
 rem '-D hex-bit-mask' enables selective debug output - see manual.htm for details.\r
 if "%2" == "-D" (\r
     if "%2" == "" (\r