Merge remote-tracking branch 'github/master' into collected-small-changes

This commit is contained in:
Axel Kohlmeyer
2021-08-26 05:30:50 -04:00
18 changed files with 1124 additions and 380 deletions

View File

@ -2,7 +2,6 @@
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:49 2021
epsilon: 1e-13
skip_tests: gpu
prerequisites: ! |
atom full
pair lj/cut/tip4p/long

View File

@ -46,7 +46,7 @@ if(Python_EXECUTABLE)
find_package_handle_standard_args(COVERAGE DEFAULT_MSG COVERAGE_BINARY)
if(COVERAGE_FOUND)
set(PYTHON_TEST_RUNNER ${Python_EXECUTABLE} -u ${COVERAGE_BINARY} run --parallel-mode --include=${LAMMPS_PYTHON_DIR}/lammps/*.py --omit=${LAMMPS_PYTHON_DIR}/install.py)
set(PYTHON_TEST_RUNNER ${Python_EXECUTABLE} -u ${COVERAGE_BINARY} run --rcfile=${CMAKE_BINARY_DIR}/.coveragerc)
else()
set(PYTHON_TEST_RUNNER ${Python_EXECUTABLE} -u)
endif()