[DAPL2] clean up dt-cli.bat script

use dt-cli 'regression' over dt-regression.bat as dt-regression was deprecated.

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2020 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 73f0921..6eb3aa1 100644 (file)
--- a/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
+++ b/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
@@ -43,7 +43,7 @@ exit /B 1
 \r
 :OK\r
 \r
-set L=5\r
+set LPS=3\r
 set X=\r
 set T=\r
 \r
@@ -227,27 +227,27 @@ if "%T%" == "lim" (
 if "%T%" == "regression" (\r
     rem run dapl regression tests - usage: dt-cli svr-IPaddr regression {loopCnt}\r
     if "%X%" == "" (\r
-        if not "%3" == ""  set L=%3\r
+        if not "%3" == ""  set LPS=%3\r
     ) else (\r
-        if not "%4" == ""  set L=%4\r
+        if not "%4" == ""  set LPS=%4\r
     )\r
-    echo %T% testing in !L! Loops\r
+    echo %T% testing in !LPS! Loops\r
     REM rdma-write, read, perf\r
     set RT=trans perf threads threadsm transm transt transme transmet transmete rdma-write rdma-read bw EP\r
-    FOR /L %%i IN (1,1,!L!) DO (\r
+    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
-           if %ERRORLEVEL% GTR 0 (\r
+           if %ERRORLEVEL% GTR 1 (\r
                echo Error %ERRORLEVEL% in regression test %%r\r
                exit /B %ERRORLEVEL%\r
            )\r
            echo loop %%i - Completed test %%r\r
-           timeout /T 3\r
+           if not "%%r" == "EP"  timeout /T 3\r
        )\r
        echo +\r
-       echo Finished %T% loop %%i\r
-       if %%i GTR !L!  timeout /T 8\r
+       echo Finished %T% loop %%i of !LPS!\r
+       if %%i LSS !LPS!  timeout /T 8\r
     )\r
     exit /B %ERRORLEVEL%\r
 )\r
@@ -255,13 +255,13 @@ 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 L=%3\r
+        if not "%3" == ""  set LPS=%3\r
     ) else (\r
-        if not "%4" == ""  set L=%4\r
+        if not "%4" == ""  set LPS=%4\r
     )\r
-    echo %T% testing in !L! Loops\r
+    echo %T% testing in !LPS! Loops\r
     REM test units from Nov-'07 OFA interop event\r
-    FOR /L %%i IN (0,1,!L!) DO (\r
+    FOR /L %%i IN (1,1,!LPS!) DO (\r
          echo %DT% -T T -s %S% -D %D% -i 4096 -t 1 -w 1 -R BE client SR 256 1 server SR 256 1\r
          %DT% -T T -s %S% -D %D% -i 4096 -t 1 -w 1 -R BE client SR 256 1 server SR 256 1\r
          if ERRORLEVEL 1 exit /B %ERRORLEVEL%\r
@@ -305,7 +305,8 @@ if "%T%" == "interop" (
          echo %DT% -T T -s %S% -D %D% -i 100 -t 1 -w 10 -V -P -R BE client SR 1024 3 server SR 1536 2\r
          %DT% -T T -s %S% -D %D% -i 100 -t 1 -w 10 -V -P -R BE client SR 1024 3 server SR 1536 2\r
          if ERRORLEVEL 1 exit /B %ERRORLEVEL%\r
-         echo %%i %T% loops completed.\r
+         echo %%i %T% loops of !LPS! completed.\r
+         if %%i LSS !LPS!  timeout /T 8\r
     )\r
     exit /B 0\r
 )\r
@@ -316,29 +317,28 @@ if "%T%" == "stop" (
 )\r
 \r
 echo usage: dt-cli hostname [testname [-D]]\r
-echo   where 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
-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
-echo     transme - transaction test: multi-endpoints per thread \r
-echo     transmet - transaction test: multi-endpoints per thread, multiple threads\r
-echo     transmete - transaction test: multi threads == endpoints\r
-echo     perf - Performance test\r
-echo     threads - multi-threaded single transaction test.\r
-echo     threadsm - multi: threads and endpoints, single transaction test.\r
-echo     rdma-write - RDMA write\r
-echo     rdma-read - RDMA read\r
-echo     bw - bandwidth\r
-echo     latb - latency tests, blocking for events\r
-echo     latp - latency tests, polling for events\r
-echo     lim - limit tests.\r
-echo     regression {loopCnt} - loop over a collection of all tests.\r
-echo     interop {loopCnt} - collection of test-units from OFA interoperability event 2007.\r
+echo  where 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
+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
+echo    transme - transaction test: multi-endpoints per thread \r
+echo    transmet - transaction test: multi-endpoints per thread, multiple threads\r
+echo    transmete - transaction test: multi threads == endpoints\r
+echo    perf - Performance test\r
+echo    threads - multi-threaded single transaction test.\r
+echo    threadsm - multi: threads and endpoints, single transaction test.\r
+echo    rdma-write - RDMA write\r
+echo    rdma-read - RDMA read\r
+echo    bw - bandwidth\r
+echo    latb - latency tests, blocking for events\r
+echo    latp - latency tests, polling for events\r
+echo    lim - limit tests.\r
+echo    regression {loopCnt,default=%LPS%} - regression + stress.\r
+echo    interop {loopCnt,default=%LPS%} - 2007 OFA interoperability event tests.\r
 \r
 ENDLOCAL\r
-@echo on\r
 @exit /B 0\r