[ofw] [PATCH] dapl-2.0: windows: remove static paths from dapltest scripts

Davis, Arlin R arlin.r.davis at intel.com
Wed May 19 10:02:39 PDT 2010


 

signed-off-by: stan smith <stan.smith at intel.com>
---
 test/dapltest/scripts/dt-cli.bat |   11 +++++------
 test/dapltest/scripts/dt-svr.bat |   12 +++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/test/dapltest/scripts/dt-cli.bat b/test/dapltest/scripts/dt-cli.bat
index f1eb23b..441b975 100644
--- a/test/dapltest/scripts/dt-cli.bat
+++ b/test/dapltest/scripts/dt-cli.bat
@@ -17,13 +17,12 @@ if not "!F!" == "off" (
 rem set DAT_OVERRIDE=D:\dapl2\dat.conf
 rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe)
 
-set PF="%ProgramFiles%\WinOF"
-
-if NOT EXIST %PF%\dapl2test.exe (
-    echo Missing file %PF%\dapl2test.exe ?
-    exit /B 1
-)
 set DT=dapl2test.exe
+%DT% -h > Nul 2>&1
+if not "%ERRORLEVEL%" == "1" (
+    echo %0: ERR - %DT% not in exec path?
+    exit /B %ERRORLEVEL%
+)
 rem     To debug dapl2test - use dapl2testd.exe with ibnic0v2d
 
 rem setup DAPL provider name: translate shorthand name or use name from dat.conf.
diff --git a/test/dapltest/scripts/dt-svr.bat b/test/dapltest/scripts/dt-svr.bat
index abd17fb..9974d23 100644
--- a/test/dapltest/scripts/dt-svr.bat
+++ b/test/dapltest/scripts/dt-svr.bat
@@ -5,15 +5,13 @@ rem
 SETLOCAL
 
 rem set DAT_OVERRIDE=C:\DAT\dat.conf
+set DT=dapl2test.exe
 
-set PF="%ProgramFiles%\WinOF"
-
-if NOT EXIST %PF%\dapl2test.exe (
-    echo Missing file %PF%\dapl2test.exe ?
-    exit /B 1
+%DT% -h > Nul 2>&1
+if not "%ERRORLEVEL%" == "1" (
+    echo %0: ERR - %DT% not in exec path?
+    exit /B %ERRORLEVEL%
 )
-
-set DT=dapl2test.exe
 rem To debug dapl2test - use dapl2testd.exe with ibnic0v2d
 
 rem which Dapl provider?
-- 
1.5.2.5




More information about the ofw mailing list