From 77f96a228dbf31dbc752167850ad9943f9f15663 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 12 Feb 2019 13:51:35 -0500 Subject: [PATCH 1/3] Updating inline comments --- tools/before-test.cmd | 2 ++ tools/run-nrtest.cmd | 1 + 2 files changed, 3 insertions(+) diff --git a/tools/before-test.cmd b/tools/before-test.cmd index 41d6cf4..7b32e5d 100644 --- a/tools/before-test.cmd +++ b/tools/before-test.cmd @@ -21,9 +21,11 @@ setlocal +:: CHANGE THESE VARIABLES TO UPDATE BENCHMARK set EXAMPLES_VER=1.0.2-dev.5 set BENCHMARK_VER=220dev5 + set "SCRIPT_HOME=%~dp0" set "EXE_HOME=buildprod\bin\Release" diff --git a/tools/run-nrtest.cmd b/tools/run-nrtest.cmd index d20087b..c39becb 100644 --- a/tools/run-nrtest.cmd +++ b/tools/run-nrtest.cmd @@ -15,6 +15,7 @@ setlocal +:: CHANGE THIS VARIABLES TO UPDATE BENCHMARK set BENCHMARK_VER=220dev5 From 874dfa9847f486dae0b7bf90224994bc4db41102 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 12 Feb 2019 15:16:54 -0500 Subject: [PATCH 2/3] Add search for SUT exe location --- tools/before-test.cmd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/before-test.cmd b/tools/before-test.cmd index 7b32e5d..fa08415 100644 --- a/tools/before-test.cmd +++ b/tools/before-test.cmd @@ -29,9 +29,10 @@ set BENCHMARK_VER=220dev5 set "SCRIPT_HOME=%~dp0" set "EXE_HOME=buildprod\bin\Release" -:: Determine SUT executable path -for %%a in ("%SCRIPT_HOME:~0,-1%") do set "SUT_PATH=%%~dpa" -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 IF NOT [%1]==[] ( set "SUT_VER=%~1" From 72573d15ba81d77f9d60e7865aa9b180232ab3ff Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 12 Feb 2019 15:32:39 -0500 Subject: [PATCH 3/3] Fix EXE_HOME --- tools/before-test.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/before-test.cmd b/tools/before-test.cmd index fa08415..30cdc68 100644 --- a/tools/before-test.cmd +++ b/tools/before-test.cmd @@ -27,7 +27,7 @@ set BENCHMARK_VER=220dev5 set "SCRIPT_HOME=%~dp0" -set "EXE_HOME=buildprod\bin\Release" +set "EXE_HOME=Release" ::: Determine SUT executable path :: TODO: This may fail when there is more than one cmake buildprod folder