From 678a2c2b4551fc79e4fd4fd27fccd24d47a11bcd Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Tue, 12 Feb 2019 13:13:35 -0500
Subject: [PATCH] Introducing default arguments

---
 appveyor.yml          |  2 +-
 tools/before-test.cmd | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 382d261..5b29350 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -58,7 +58,7 @@ build_script:
 
 before_test:
   - cd %EPANET_HOME%
-  - tools\before-test.cmd %TEST_HOME% %EPANET_HOME%\%BUILD_HOME%\bin\Release %APPVEYOR_REPO_COMMIT%
+  - tools\before-test.cmd %APPVEYOR_REPO_COMMIT%
 
 # run custom test script
 test_script:
diff --git a/tools/before-test.cmd b/tools/before-test.cmd
index 3c04d89..dca4cca 100644
--- a/tools/before-test.cmd
+++ b/tools/before-test.cmd
@@ -7,9 +7,8 @@
 ::          US EPA - ORD/NRMRL
 ::
 ::  Arguments:
-::    1 - relative path regression test file staging location
-::    2 - absolute path to location of software under test
-::    3 - build identifier for software under test
+::    1 - build identifier for software under test
+::    2 - (relative path regression test file staging location)
 ::
 ::  Note:
 ::    Tests and benchmark files are stored in the epanet-example-networks repo.
@@ -21,13 +20,24 @@
 @echo off
 setlocal
 
-set SCRIPT_HOME=%~dp0
-set TEST_HOME=%~1
-
 
 set EXAMPLES_VER=1.0.2-dev.5
 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%
+
+:: Check existence and apply default arguments
+IF NOT [%1]==[] ( set "SUT_VER=%~1"
+) ELSE ( set "SUT_VER=vXXX" )
+
+IF NOT [%2]==[] ( set "TEST_HOME=%~2"
+) ELSE ( set "TEST_HOME=nrtestsuite" )
+
 
 set TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v%EXAMPLES_VER%.zip
 set BENCHFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/v%EXAMPLES_VER%/epanet-benchmark-%BENCHMARK_VER%.zip
@@ -59,4 +69,4 @@ mklink /D .\tests .\epanet-example-networks-%EXAMPLES_VER%\epanet-tests
 
 :: generate json configuration file for software under test
 mkdir apps
-%SCRIPT_HOME%\gen-config.cmd %~2 > apps\epanet-%~3.json
+%SCRIPT_HOME%\gen-config.cmd %SUT_PATH% > apps\epanet-%SUT_VER%.json