diff --git a/tools/nrtest-epanet/setup.py b/tools/nrtest-epanet/setup.py index 4c7dfd7..ead607f 100644 --- a/tools/nrtest-epanet/setup.py +++ b/tools/nrtest-epanet/setup.py @@ -8,6 +8,7 @@ # US EPA - ORD/NRMRL # ''' Setup up script for nrtest_epanet package. ''' +''' 'epanet mincdd = nrtest_epanet:epanet_mincdd_compare', ''' try: from setuptools import setup @@ -17,7 +18,6 @@ except ImportError: entry_points = { 'nrtest.compare': [ 'epanet allclose = nrtest_epanet:epanet_allclose_compare', - 'epanet mincdd = nrtest_epanet:epanet_mincdd_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 743d105..159b2c8 100644 --- a/tools/run-nrtest.cmd +++ b/tools/run-nrtest.cmd @@ -42,7 +42,7 @@ set TEST_OUTPUT_PATH=benchmark\epanet-%SUT_BUILD_ID% set NRTEST_COMPARE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest compare set REF_OUTPUT_PATH=benchmark\epanet-%REF_BUILD_ID% set RTOL_VALUE=0.01 -set ATOL_VALUE=0.0 +set ATOL_VALUE=0.0001 :: change current directory to test suite cd %TEST_SUITE_PATH% @@ -52,10 +52,10 @@ if exist %TEST_OUTPUT_PATH% ( rmdir /s /q %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% +::echo INFO: Creating SUT %SUT_BUILD_ID% artifacts +::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.