JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #392 from michaeltryby/dev

Browse Source 
Add search for SUT exe location
This commit is contained in:
Michael Tryby
2019-02-12 15:40:04 -05:00
committed by GitHub
parent 3127e2ca7c 72573d15ba
commit aef6e29bd6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/before-test.cmd
View File

@@ -21,15 +21,18 @@
setlocal setlocal
:: CHANGE THESE VARIABLES TO UPDATE BENCHMARK
set EXAMPLES_VER=1.0.2-dev.5 set EXAMPLES_VER=1.0.2-dev.5
set BENCHMARK_VER=220dev5 set BENCHMARK_VER=220dev5
set "SCRIPT_HOME=%~dp0"
set "EXE_HOME=buildprod\bin\Release"
:: Determine SUT executable path set "SCRIPT_HOME=%~dp0"
for %%a in ("%SCRIPT_HOME:~0,-1%") do set "SUT_PATH=%%~dpa" set "EXE_HOME=Release"
set SUT_PATH=%SUT_PATH%%EXE_HOME%
::: Determine SUT executable path
:: TODO: This may fail when there is more than one cmake buildprod folder
for /d /r "%SCRIPT_HOME%..\" %%a in (*) do if /i "%%~nxa"=="bin" set "BUILD_HOME=%%a"
set SUT_PATH=%BUILD_HOME%\%EXE_HOME%
:: Check existence and apply default arguments :: Check existence and apply default arguments
IF NOT [%1]==[] ( set "SUT_VER=%~1" IF NOT [%1]==[] ( set "SUT_VER=%~1"

1
tools/run-nrtest.cmd
View File

@@ -15,6 +15,7 @@
setlocal setlocal
:: CHANGE THIS VARIABLES TO UPDATE BENCHMARK
set BENCHMARK_VER=220dev5 set BENCHMARK_VER=220dev5