Skip to content

Commit 072389f

Browse files
authored
Merge pull request #1419 from andrew-platt/b/RegTestWin_docs
Docs: update manual regression testing syntax for Windows
2 parents a8942cf + 0abd13f commit 072389f

File tree

3 files changed

+20
-24
lines changed

3 files changed

+20
-24
lines changed

docs/source/testing/regression_test.rst

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following packages are required for regression testing:
6868
- Python 3.7+
6969
- Numpy
7070
- CMake and CTest (Optional)
71-
- Bokeh 1.4 (Optional)
71+
- Bokeh 2.4+ (Optional)
7272

7373
.. _python_driver:
7474

@@ -85,17 +85,15 @@ executing with the help option:
8585

8686
>>>$ python manualRegressionTest.py -h
8787
usage: manualRegressionTest.py [-h] [-p [Plotting-Flag]] [-n [No-Execution]]
88-
[-v [Verbose-Flag]] [-case [Case-Name]]
89-
OpenFAST System-Name Compiler-Id Test-Tolerance
88+
[-v [Verbose-Flag]] [-case [Case-Name]] [-module [Module-Name]]
89+
Executable-Name Relative-Tolerance Absolute-Tolerance
9090

91-
Executes OpenFAST and a regression test for a single test case.
91+
Executes OpenFAST or driver and a regression test for a single test case.
9292

9393
positional arguments:
94-
OpenFAST path to the OpenFAST executable
95-
System-Name current system's name: [Darwin,Linux,Windows]
96-
Compiler-Id compiler's id: [Intel,GNU]
97-
Test-Tolerance tolerance defining pass or failure in the regression
98-
test
94+
Executable-Name path to the executable
95+
Relative-Tolerance Relative tolerance to allow the solution to deviate; expressed as order of magnitudes less than baseline.
96+
Absolute-Tolerance Absolute tolerance to allow small values to pass; expressed as order of magnitudes less than baseline.
9997

10098
optional arguments:
10199
-h, --help show this help message and exit
@@ -106,6 +104,8 @@ executing with the help option:
106104
-v [Verbose-Flag], -verbose [Verbose-Flag]
107105
bool to include verbose system output
108106
-case [Case-Name] single case name to execute
107+
-module [Module-Name], -mod [Module-Name]
108+
name of module to execute
109109

110110
.. note::
111111

@@ -351,17 +351,15 @@ included Python driver.
351351
cd reg_tests
352352
python manualRegressionTest.py -h
353353
# usage: manualRegressionTest.py [-h] [-p [Plotting-Flag]] [-n [No-Execution]]
354-
# [-v [Verbose-Flag]] [-case [Case-Name]]
355-
# OpenFAST System-Name Compiler-Id Test-Tolerance
354+
# [-v [Verbose-Flag]] [-case [Case-Name]] [-module [Module-Name]]
355+
# Executable-Name Relative-Tolerance Absolute-Tolerance
356356
#
357-
# Executes OpenFAST and a regression test for a single test case.
357+
# Executes OpenFAST or driver and a regression test for a single test case.
358358
#
359359
# positional arguments:
360-
# OpenFAST path to the OpenFAST executable
361-
# System-Name current system's name: [Darwin,Linux,Windows]
362-
# Compiler-Id compiler's id: [Intel,GNU]
363-
# Test-Tolerance tolerance defining pass or failure in the regression
364-
# test
360+
# Executable-Name path to the executable
361+
# Relative-Tolerance Relative tolerance to allow the solution to deviate; expressed as order of magnitudes less than baseline.
362+
# Absolute-Tolerance Absolute tolerance to allow small values to pass; expressed as order of magnitudes less than baseline.
365363
#
366364
# optional arguments:
367365
# -h, --help show this help message and exit
@@ -372,12 +370,10 @@ included Python driver.
372370
# -v [Verbose-Flag], -verbose [Verbose-Flag]
373371
# bool to include verbose system output
374372
# -case [Case-Name] single case name to execute
373+
# -module [Module-Name], -mod [Module-Name]
374+
# name of module to execute
375375
376-
python manualRegressionTest.py \
377-
..\build\bin\openfast_x64_Double.exe \
378-
Windows \
379-
Intel \
380-
1e-5
376+
python manualRegressionTest.py ..\build\bin\openfast_x64_Double.exe 2.0 1.9
381377
382378
.. _reg_test_windows:
383379

docs/source/testing/regression_test_windows.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Windows with Visual Studio regression test
8484

8585
b) Change your working directory to ``openfast\reg_tests``
8686

87-
c) Type: ``python manualRegressionTest.py ..\build\bin\openfast_x64_Double.exe Windows Intel 1e-5``
87+
c) Type: ``python manualRegressionTest.py ..\build\bin\openfast_x64_Double.exe 2.0 1.9``
8888
You should see this: ``executing AWT_YFix_WSt``
8989

9090
d) The tests will continue to execute one-by-one until you finally see something like this:

reg_tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Dependencies required to run the regression test suite are
1010
- Python 3.7+
1111
- Numpy
1212
- CMake and CTest
13-
- Bokeh 1.4 (optional)
13+
- Bokeh 2.4+ (optional)
1414

1515
## Execution
1616
The automated regression test runs CTest and can be executed by running either of the commands `make test` or `ctest` from the build directory. If the entire OpenFAST package is to be built, CMake will configure CTest to find the new binary at `openfast/build/glue-codes/openfast/openfast`. However, if the intention is to build only the test suite, the OpenFAST binary should be specified in the CMake configuration under the `CTEST_OPENFAST_EXECUTABLE` flag. There is also a corresponding `CTEST_[MODULE]_NAME` flag for each module that is included in the regression test.

0 commit comments

Comments
 (0)