dapltest: update windows script files

Enhancement to take DAPL provider name as cmd-line arguement.

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/test/dapltest/scripts/dt-cli.bat b/test/dapltest/scripts/dt-cli.bat
index 0314e50375c00aeea8ff6ff16df675fcaa3f4d11..368e8e33ecf9302f9a058cfc0120690be47f9077 100644 (file)
--- a/test/dapltest/scripts/dt-cli.bat
+++ b/test/dapltest/scripts/dt-cli.bat
@@ -1,6 +1,6 @@
 @echo off\r
 rem\r
-rem Sample DAPLtest client Usage: dt-cli.bat hostname [testname -D]\r
+rem Sample DAPLtest client Usage: dt-cli.bat provider hostname testname [-D]\r
 rem\r
 \r
 SETLOCAL\r
@@ -23,47 +23,36 @@ if EXIST "%ProgramFiles(x86)%" (
     set PF="%ProgramFiles%\WinOF"\r
 )\r
 \r
-rem Program name of dt-svr preferes dapl2test.exe, otherwise prefer dapltest.exe\r
-if "%0" == "dt-cli" (\r
-    if EXIST %PF%\dapl2test.exe (\r
-        set DT=dapl2test.exe\r
-        set D=ibnic0v2\r
-rem     To debug dapl2test - use dapl2testd.exe with ibnic0v2d\r
-        goto OK\r
-    )\r
+if NOT EXIST %PF%\dapl2test.exe (\r
+    echo Missing file %PF%\dapl2test.exe ?\r
+    exit /B 1\r
 )\r
+set DT=dapl2test.exe\r
+rem     To debug dapl2test - use dapl2testd.exe with ibnic0v2d\r
+\r
 \r
-if EXIST %PF%\dapltest.exe (\r
-        set DT=dapltest.exe\r
-        set D=ibnic0\r
-        goto OK\r
+if "%1" == "" goto usage\r
+if "%1" == "ibal"  set D=ibnic0v2\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
-echo Unable to find dapltest.exe or dapl2test.exe?\r
-exit /B 1\r
 \r
-:OK\r
+rem DaplTest server hostname\r
+if "%2" == "" goto usage\r
+set S=%2\r
+\r
+rem Which test ?\r
+if "%3" == "" goto usage\r
+set T=%3\r
 \r
 set LPS=3\r
-set X=\r
-set T=\r
 \r
-if "%1" == "" (\r
-    rem set /P S= [Server-Hostname]\r
-) else (\r
-    if "%1" == "-h" (\r
-        set T=\r
-    ) else (\r
-        set S=%1\r
-        set T=\r
-        if not "%2" == "" (\r
-            set T=%2\r
-            if "%3" == "-D" (\r
-                set X=0xffff\r
-            )\r
-        )\r
-    )\r
-)\r
+rem Enable DEBUG?\r
 \r
+if "%4" == "-D" (set X=0xffff) else set X=\r
 if not "%X%" == "" (\r
     set DAT_OS_DBG_TYPE=%X%\r
     set DAT_DBG_TYPE=%X%\r
@@ -257,11 +246,11 @@ if "%T%" == "lim" (
 )\r
 \r
 if "%T%" == "regression" (\r
-    rem run dapl regression tests - usage: dt-cli svr-IPaddr regression {loopCnt}\r
+    rem run dapl regression tests - usage: dt-cli provider svr-IPaddr regression {loopCnt}\r
     if "%X%" == "" (\r
-        if not "%3" == ""  set LPS=%3\r
-    ) else (\r
         if not "%4" == ""  set LPS=%4\r
+    ) else (\r
+        if not "%5" == ""  set LPS=%5\r
     )\r
     echo %T% testing in !LPS! Loops\r
     REM rdma-write, read, perf\r
@@ -289,9 +278,9 @@ if "%T%" == "regression" (
 if "%T%" == "interop" (\r
     REM test units from Nov-'07 OFA interop event. usage dt-cli server-IPaddr interop {LoopCount}\r
     if "%X%" == "" (\r
-        if not "%3" == ""  set LPS=%3\r
-    ) else (\r
         if not "%4" == ""  set LPS=%4\r
+    ) else (\r
+        if not "%5" == ""  set LPS=%5\r
     )\r
     echo %T% testing in !LPS! Loops\r
     REM test units from Nov-'07 OFA interop event\r
@@ -354,8 +343,18 @@ if "%T%" == "stop" (
     goto xit\r
 )\r
 \r
-echo usage: dt-cli hostname [testname [-D]]\r
-echo  where testname\r
+:usage\r
+\r
+echo.\r
+echo usage: dt-cli dapl-provider dt-svr-hostname [testname [-D]]\r
+echo.\r
+echo where:\r
+echo.\r
+echo  dapl-provider - ibal scn cma\r
+echo.\r
+echo  dt-svr-hostname - IPv4 hostanme where the DaplTest server is running\r
+echo.\r
+echo  testname\r
 echo    stop - request DAPLtest server to exit.\r
 echo    conn - simple connection test with limited data transfer\r
 echo    EP - Multiple EndPoints(7) and Threads(5) Transactions\r
@@ -377,13 +376,16 @@ echo    latp - latency tests, polling for events
 echo    lim - limit tests.\r
 echo    regression {loopCnt,default=%LPS%} - regression + stress.\r
 echo    interop {loopCnt,default=%LPS%} - 2007 OFA interoperability event tests.\r
+goto rxt\r
 \r
 :xit\r
+\r
 if %ERRORLEVEL% EQU 0 (\r
-       echo +\r
+       echo.\r
        echo %0 %*\r
        echo    Start %STIME% \r
        echo    End   %ETIME%\r
 )\r
+:rxt\r
 ENDLOCAL\r
 exit /B %ERRORLEVEL%\r

diff --git a/test/dapltest/scripts/dt-svr.bat b/test/dapltest/scripts/dt-svr.bat
index e68a71c73003763c3df63ef6b1b26899d9d08588..a774aac1de3062ed39833f73b92d6aff6816245c 100644 (file)
--- a/test/dapltest/scripts/dt-svr.bat
+++ b/test/dapltest/scripts/dt-svr.bat
@@ -1,6 +1,6 @@
 @echo off\r
 rem\r
-rem Sample DAPLtest server - usage: dt-svr [ -D [dbg-bit-mask] ]\r
+rem DAPLtest server - usage: dt-svr dapl-provider [ -D [dbg-bit-mask] ]\r
 rem\r
 SETLOCAL\r
 \r
@@ -12,28 +12,34 @@ if EXIST "%ProgramFiles(x86)%" (
     set PF="%ProgramFiles%\WinOF"\r
 )\r
 \r
-rem Program name of dt-svr preferes dapl2test.exe, otherwise prefer dapltest.exe\r
-if "%0" == "dt-svr" (\r
-    if EXIST %PF%\dapl2test.exe (\r
-        set DT=dapl2test.exe\r
-        set DEV=ibnic0v2\r
-        goto OK\r
-    )\r
+if NOT EXIST %PF%\dapl2test.exe (\r
+    echo Missing file %PF%\dapl2test.exe ?\r
+    exit /B 1\r
 )\r
 \r
-if EXIST %PF%\dapltest.exe (\r
-        set DT=dapltest.exe\r
-        set DEV=ibnic0\r
-        goto OK\r
+set DT=dapl2test.exe\r
+rem To debug dapl2test - use dapl2testd.exe with ibnic0v2d\r
+\r
+rem which Dapl provider?\r
+\r
+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
+    exit /B 1\r
 )\r
-echo Unable to find dapltest.exe or dapl2test.exe?\r
-exit /B\r
 \r
-:OK\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
 \r
 rem '-D' enables full debug output\r
 rem '-D hex-bit-mask' enables selective debug output - see manual.htm for details.\r
-if "%1" == "-D" (\r
+if "%2" == "-D" (\r
     if "%2" == "" (\r
         set X=0xfffff\r
     ) else (\r
@@ -53,13 +59,13 @@ if not "%X%" == "" (
 \r
 rem    start a dapltest server on the local node - server is waiting for\r
 rem    dapltest 'client' to issue dapltest commands (dt-cli.bat).\r
-rem    Client runs 'dt-cli IP-addr stop' to shutdown this dapltest server.\r
+rem    Client runs 'dt-cli provider IP-addr stop' to shutdown this dapltest server.\r
 \r
 echo %DT% -T S -d -D %DEV%\r
 \r
 %DT% -T S -D %DEV%\r
 \r
-echo %0 - %DT% server exit...\r
+echo %0 - %DT% [%DEV%] server exit...\r
 \r
 ENDLOCAL\r
 exit /B %ERRORLEVEL%\r