diff --git a/source/python/_config.py b/source/python/_config.py index 4d037ccf3827d2e54a519917961f4423e6cca953..908ee3c03df83f66333e2de0bd4097c12b83f99e 100644 --- a/source/python/_config.py +++ b/source/python/_config.py @@ -84,6 +84,7 @@ PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'jobscripts') PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'fortran') PATH_PYTHONTEST_SRC = os.path.join(PATH_SOURCES, 'pythontest') PATH_INPUT_DIR = os.path.join(PATH_RUN_DIR, INPUT_DIRNAME_DEFAULT) +PATH_TEST = os.path.join(PATH_FLEXEXTRACT_DIR, 'test') if os.getenv('CONTROL'): # this is only needed if gateway version with job script is used! # because job is directly submitted from SCRATCH and because the @@ -105,3 +106,4 @@ PATH_REL_ECMWF_ENV = os.path.relpath(PATH_ECMWF_ENV, PATH_FLEXEXTRACT_DIR) PATH_REL_RUN_DIR = os.path.relpath(PATH_RUN_DIR, PATH_FLEXEXTRACT_DIR) PATH_REL_JOBSCRIPTS = os.path.relpath(PATH_JOBSCRIPTS, PATH_FLEXEXTRACT_DIR) PATH_REL_FORTRAN_SRC = os.path.relpath(PATH_FORTRAN_SRC, PATH_FLEXEXTRACT_DIR) +PATH_REL_TEST = os.path.relpath(PATH_TEST, PATH_FLEXEXTRACT_DIR) diff --git a/source/python/install.py b/source/python/install.py index 7246cb90fdfeddcc8addd7ab474e2adf265c0b32..e719746b96e858833f45f293697636e07e699f6c 100755 --- a/source/python/install.py +++ b/source/python/install.py @@ -321,6 +321,8 @@ def mk_tarball(tarball_path, target): controlfiles = [os.path.relpath(x, ecd) for x in UioFiles(_config.PATH_REL_CONTROLFILES, 'CONTROL*').files] + testfiles = [os.path.relpath(x, ecd) + for x in UioFiles(_config.PATH_REL_TEST , '*').files] tempfiles = [os.path.relpath(x, ecd) for x in UioFiles(_config.PATH_REL_TEMPLATES , '*.temp').files] nlfiles = [os.path.relpath(x, ecd) @@ -338,7 +340,7 @@ def mk_tarball(tarball_path, target): # concatenate single lists to one for a better looping filelist = pyfiles + pytestfiles + controlfiles + tempfiles + nlfiles + \ ffiles + gribtable + hfiles + makefiles + ECMWF_ENV_FILE + \ - runfile + jobdir + \ + runfile + jobdir + testfiles +\ ['CODE_OF_CONDUCT.md', 'LICENSE.md', 'README.md'] # create installation tar-file