Commit 8ef7a0e2 authored by Jan Kiene's avatar Jan Kiene
Browse files

adapt to using conformance package

parent 8779a64a
Loading
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ README_FILES_PARALLEL = [
]
README_FILES_JBM = ["Readme_JBM_dec.txt"]
README_FILES = README_FILES_PARALLEL + README_FILES_JBM
BINARY_PATHS = ["bin/EVS_cod", "bin/EVS_dec"]
BINARY_PATHS = ["./bin/EVS_cod", "./bin/EVS_dec"]
FOLDER_PATHS = ["switchPaths", "testv"]

BIN_PATHS = BINARY_PATHS * 2

def main():

@@ -27,13 +27,13 @@ def main():
    # run first part in parallel
    with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
        executor.map(
            run_file, README_FILES_PARALLEL, [result_dict] * len(README_FILES_PARALLEL)
            run_file, README_FILES_PARALLEL, BIN_PATHS, [result_dict] * len(README_FILES_PARALLEL)
        )

    # JBM test can not run concurrently with the others
    run_file(README_FILES_JBM[0], result_dict)
    run_file(README_FILES_JBM[0], BINARY_PATHS[1], result_dict)

    return analyze_results(result_dict)
    return int(any(result_dict.values()))


def analyze_results(result_dict):
@@ -49,17 +49,17 @@ def analyze_results(result_dict):
    return ret


def run_file(filename: str, result_dict: dict):
    ret_code = subprocess.call(["bash", filename])
def run_file(filename: str, bin_path: str, result_dict: dict):
    ret_code = subprocess.call(["bash", filename, bin_path])
    with Lock():
        result_dict[filename] = ret_code


def environment_is_correct():
    """
    Check that the folder with the test resources is et up correctly:
    Check that the folder with the test resources is set up correctly:
    - all Readme files there
    - EVS binaris available in bin/
    - EVS binaries available in bin/
    - testv and switchPaths folder exist - Content is not checked, though
    """
    ret = True