Adjustment to regression test criteria - 2

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
     ]
 }

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.