Improving reg testing helper scripts

appveyor.yml

@@ -21,14 +21,19 @@ environment:
     GENERATOR: "Visual Studio 15 2017"
     GROUP: "SUPPORTED"
     BOOST_ROOT: "C:/Libraries/boost_1_67_0"
+    PLATFORM: "win32"
+    REF_BUILD_ID: "220dev5"
   # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     GENERATOR: "Visual Studio 15 2017 Win64"
     GROUP: "EXPERIMENTAL"
     BOOST_ROOT: "C:/Libraries/boost_1_67_0"
+    PLATFORM: "win64"
+    REF_BUILD_ID:
 
 # called before repo cloning
 init:
+  - set SUT_BUILD_ID=%APPVEYOR_BUILD_NUMBER%_%APPVEYOR_JOB_NUMBER%
   - set EPANET_HOME=%APPVEYOR_BUILD_FOLDER%
   - set BUILD_HOME=buildprod
   - set TEST_HOME=nrtestsuite
@@ -58,7 +63,7 @@ build_script:
 
 before_test:
   - cd %EPANET_HOME%
-  - tools\before-test.cmd %APPVEYOR_REPO_COMMIT%
+  - tools\before-test.cmd %PLATFORM% %REF_BUILD_ID% %SUT_BUILD_ID% %APPVEYOR_REPO_COMMIT%
 
 # run custom test script
 test_script:
@@ -67,13 +72,14 @@ test_script:
   - ctest -C Release
   # run regression tests
   - cd %EPANET_HOME%
-  - tools\run-nrtest.cmd %APPVEYOR_REPO_COMMIT%
+  - tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%
 
-after_test:
+on_success:
+  - cd %TEST_HOME%\benchmark
+  - appveyor PushArtifact receipt.json
+
+on_failure:
   - cd %TEST_HOME%\benchmark
   # zip up the SUT benchmarks
-  - 7z a epanet-benchmark.zip \epanet-%APPVEYOR_REPO_COMMIT%\
-
-artifacts:
-  - path: epanet-benchmark.zip
-    name: epanet-benchmark.zip
+  - 7z a benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip .\epanet-%SUT_BUILD_ID%
+  - appveyor PushArtifact benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip