From 9e286293aee7015e7db38eaac67a61c666eef816 Mon Sep 17 00:00:00 2001
From: Lew Rossman <LRossman@cinci.rr.com>
Date: Tue, 20 Apr 2021 10:13:03 -0400
Subject: [PATCH] Adjustment to regression test criteria - 2

---
 tools/nrtest-epanet/setup.py | 2 +-
 tools/run-nrtest.cmd         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/nrtest-epanet/setup.py b/tools/nrtest-epanet/setup.py
index ead607f..ceb1126 100644
--- a/tools/nrtest-epanet/setup.py
+++ b/tools/nrtest-epanet/setup.py
@@ -9,6 +9,7 @@
 #
 ''' Setup up script for nrtest_epanet package. '''
 '''        'epanet mincdd = nrtest_epanet:epanet_mincdd_compare',  '''
+'''        'epanet report = nrtest_epanet:epanet_report_compare',  '''
 
 try: 
     from setuptools import setup
@@ -18,7 +19,6 @@ except ImportError:
 entry_points = {
     'nrtest.compare': [
         'epanet allclose = nrtest_epanet:epanet_allclose_compare',
-        'epanet report = nrtest_epanet:epanet_report_compare',
         # Add entry point for new comparison functions here
     ]
 }
diff --git a/tools/run-nrtest.cmd b/tools/run-nrtest.cmd
index 159b2c8..337a394 100644
--- a/tools/run-nrtest.cmd
+++ b/tools/run-nrtest.cmd
@@ -53,9 +53,9 @@ if exist %TEST_OUTPUT_PATH% (
 )
 
 ::echo INFO: Creating SUT %SUT_BUILD_ID% artifacts
-::set NRTEST_COMMAND=%NRTEST_EXECUTE_CMD% %TEST_APP_PATH% %TESTS% -o %TEST_OUTPUT_PATH%
+set NRTEST_COMMAND=%NRTEST_EXECUTE_CMD% %TEST_APP_PATH% %TESTS% -o %TEST_OUTPUT_PATH%
 :: if there is an error exit the script with error value 1
-::%NRTEST_COMMAND% || exit /B 1
+%NRTEST_COMMAND% || exit /B 1
 
 echo.