Commit a8929f64 authored by Jan Kiene's avatar Jan Kiene
Browse files

add checks for submodule in the test helper scripts

parent e1e236b3

tests/prepare_pytests.py

+13 −3
Original line number Diff line number Diff line
@@ -34,13 +34,23 @@ __doc__ = """ 
Script to prepare the pytest tests.

"""



import os

import sys

from pathlib import Path



try:

    here = Path(__file__).parent.resolve()

    scripts_dir = str(here.joinpath("../scripts/ivas-processing-scripts").resolve())

    sys.path.append(scripts_dir)

    import ivas_processing_scripts

except ImportError:

    print("Can not import ivas_processing_scripts - please run 'git submodule update --init' and try again")

    sys.exit(0)



import os

import argparse

import subprocess

import platform



from pathlib import Path

from create_short_testvectors import create_short_testvectors



BIN_EXT = ".exe" if platform.system() == "Windows" else ""
@@ -96,7 +106,7 @@ def main(argv): 
    if platform.system() == "Windows":

        base_cmd = ["pytest"]

    else:

        base_cmd = ["python3", "-m", "pytest"]

        base_cmd = ["python3.10", "-m", "pytest"]

    if args.param_file:

        base_cmd += ["tests/test_param_file.py", "--param_file", args.param_file]

    else:

tests/run_pytests.py

+13 −3
Original line number Diff line number Diff line
@@ -37,12 +37,22 @@ Test prerequisites are checked for and check failures are reported. 
When prerequisites are met, the pytest test is executed.

"""



import os

import sys

from pathlib import Path



try:

    here = Path(__file__).parent.resolve()

    scripts_dir = str(here.joinpath("../scripts/ivas-processing-scripts").resolve())

    sys.path.append(scripts_dir)

    import ivas_processing_scripts

except ImportError:

    print("Can not import ivas_processing_scripts - please run 'git submodule update --init' and try again")

    sys.exit(0)



import os

import argparse

import subprocess

import platform

from pathlib import Path



BIN_EXT = ".exe" if platform.system() == "Windows" else ""

HERE = Path(__file__).parent.resolve()
@@ -91,7 +101,7 @@ def main(argv): 
    if platform.system() == "Windows":

        cmd = ["pytest"]

    else:

        cmd = ["python3", "-m", "pytest"]

        cmd = ["python3.10", "-m", "pytest"]

    if args.param_file:

        cmd += ["tests/test_param_file.py", "--param_file", args.param_file]

    else: