JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Adjustment to regression test criteria

Browse Source
This commit is contained in:
Lew Rossman
2021-04-20 09:26:34 -04:00
parent bec7c0db0f
commit 9224d67a00
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/nrtest-epanet/setup.py
View File

@@ -8,6 +8,7 @@
# US EPA - ORD/NRMRL # US EPA - ORD/NRMRL
# #
''' Setup up script for nrtest_epanet package. ''' ''' Setup up script for nrtest_epanet package. '''
''' 'epanet mincdd = nrtest_epanet:epanet_mincdd_compare', '''
try: try:
from setuptools import setup from setuptools import setup
@@ -17,7 +18,6 @@ except ImportError:
entry_points = { entry_points = {
'nrtest.compare': [ 'nrtest.compare': [
'epanet allclose = nrtest_epanet:epanet_allclose_compare', 'epanet allclose = nrtest_epanet:epanet_allclose_compare',
'epanet mincdd = nrtest_epanet:epanet_mincdd_compare',
'epanet report = nrtest_epanet:epanet_report_compare', 'epanet report = nrtest_epanet:epanet_report_compare',
# Add entry point for new comparison functions here # Add entry point for new comparison functions here
] ]

8
tools/run-nrtest.cmd
View File

@@ -42,7 +42,7 @@ set TEST_OUTPUT_PATH=benchmark\epanet-%SUT_BUILD_ID%
set NRTEST_COMPARE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest compare set NRTEST_COMPARE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest compare
set REF_OUTPUT_PATH=benchmark\epanet-%REF_BUILD_ID% set REF_OUTPUT_PATH=benchmark\epanet-%REF_BUILD_ID%
set RTOL_VALUE=0.01 set RTOL_VALUE=0.01
set ATOL_VALUE=0.0 set ATOL_VALUE=0.0001
:: change current directory to test suite :: change current directory to test suite
cd %TEST_SUITE_PATH% cd %TEST_SUITE_PATH%
@@ -52,10 +52,10 @@ if exist %TEST_OUTPUT_PATH% (
rmdir /s /q %TEST_OUTPUT_PATH% rmdir /s /q %TEST_OUTPUT_PATH%
) )
echo INFO: Creating SUT %SUT_BUILD_ID% artifacts ::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 :: if there is an error exit the script with error value 1
%NRTEST_COMMAND% || exit /B 1 ::%NRTEST_COMMAND% || exit /B 1
echo. echo.