dapltest: update script files for WinOF

Cleanup 64-bit paths now that WinOF is always installed into '\Program Files\WinOF'.

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 c445d5a875124077ed37a32a0e69a9ae802cebb6..f1eb23b8842e3a43b8c637f187df6a3b75c82310 100644 (file)
--- a/test/dapltest/scripts/dt-cli.bat
+++ b/test/dapltest/scripts/dt-cli.bat
@@ -17,11 +17,7 @@ if not "!F!" == "off" (
 rem set DAT_OVERRIDE=D:\dapl2\dat.conf\r
 rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe)\r
 \r
-if EXIST "%ProgramFiles(x86)%" (\r
-    set PF="%ProgramFiles(x86)%\WinOF"\r
-) else (\r
-    set PF="%ProgramFiles%\WinOF"\r
-)\r
+set PF="%ProgramFiles%\WinOF"\r
 \r
 if NOT EXIST %PF%\dapl2test.exe (\r
     echo Missing file %PF%\dapl2test.exe ?\r
@@ -231,9 +227,9 @@ if "%T%" == "regression" (
        for %%r in ( !RT! ) do (\r
            echo loop %%i - start test %%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
+           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
            if not "%%r" == "EP"  timeout /T 3\r
@@ -361,7 +357,7 @@ rem Execute the single daplest Command (CMD), observe -Q switch
 \r
 :xit\r
 \r
-if %ERRORLEVEL% EQU 0 (\r
+if !ERRORLEVEL! EQU 0 (\r
        echo.\r
        echo %0 %*\r
        echo    Start %STIME% \r
@@ -369,4 +365,4 @@ if %ERRORLEVEL% EQU 0 (
 )\r
 :rxt\r
 ENDLOCAL\r
-exit /B %ERRORLEVEL%\r
+exit /B !ERRORLEVEL!\r

diff --git a/test/dapltest/scripts/dt-svr.bat b/test/dapltest/scripts/dt-svr.bat
index c876d413fe35dd03692b48f06305aaff663149b8..abd17fb00f48e0b113a55f6aac22b1da4c30839c 100644 (file)
--- a/test/dapltest/scripts/dt-svr.bat
+++ b/test/dapltest/scripts/dt-svr.bat
@@ -6,11 +6,7 @@ SETLOCAL
 \r
 rem set DAT_OVERRIDE=C:\DAT\dat.conf\r
 \r
-if EXIST "%ProgramFiles(x86)%" (\r
-    set PF="%ProgramFiles(x86)%\WinOF"\r
-) else (\r
-    set PF="%ProgramFiles%\WinOF"\r
-)\r
+set PF="%ProgramFiles%\WinOF"\r
 \r
 if NOT EXIST %PF%\dapl2test.exe (\r
     echo Missing file %PF%\dapl2test.exe ?\r