Commit 38958c9c authored by Jan Kiene's avatar Jan Kiene
Browse files

harmonize name tags

parent f9e9c917

tests/codec_be_on_mr_nonselection/test_sba.py

+4 −17
Original line number Diff line number Diff line
@@ -653,17 +653,11 @@ def sba_enc( 
        short_tag_ext += "_SID"

    if pca:

        short_tag_ext += "_pca"

    # to avoid conflicting names in case of parallel test execution, differentiate all cases

    long_tag_ext = ""

    if gain_flag != -1:

        long_tag_ext += f"_Gain{gain_flag}"

    if SID == 1:

        long_tag_ext += "_SID"

    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.192"

    dut_pkt_file = f"{dut_out_dir}/{tag_out}{short_tag_ext}.192"

    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.192"

    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.192"

    if SID == 1:

        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.192"

        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{short_tag_ext}_cut.192"

        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.192"

        ref_pkt_file_dutenc_cut = (

            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.192"
@@ -779,16 +773,10 @@ def sba_dec( 
        short_tag_ext += "_pca"

    if SID == 1:

        short_tag_ext += "_SID_cut"

    # to avoid conflicting names in case of parallel test execution, differentiate all cases

    long_tag_ext = ""

    if gain_flag != -1:

        long_tag_ext += f"_Gain{gain_flag}"

    if SID == 1:

        long_tag_ext += "_SID_cut"

    dut_out_dir = f"{dut_base_path}/sba_bs/raw"

    ref_out_dir = f"{reference_path}/sba_bs/raw"



    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"

    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"

    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"

    ref_in_pkt_dutenc = (

        f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}_dutenc.192"
@@ -804,10 +792,9 @@ def sba_dec( 
    plc_file = None

    if plc_pattern is not None:

        plc_file = f"{TESTV_DIR}/{plc_pattern}.g192"

        long_tag_ext = f"{long_tag_ext}_{plc_pattern}"

        short_tag_ext = f"{short_tag_ext}_{plc_pattern}"



    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.wav"

    dut_out_raw = f"{dut_out_dir}/{tag_out}{short_tag_ext}.wav"

    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.wav"



    check_and_makedir(dut_out_dir)

tests/conftest.py

+7 −8
Original line number Diff line number Diff line
@@ -57,16 +57,15 @@ from .constants import ( 
    ODG,

    MAX_ENC_DIFF,

    MAX_ENC_DIFF_PATTERN,

    SCRIPTS_DIR,

)



logger = logging.getLogger(__name__)

USE_LOGGER_FOR_DBG = False  # current tests do not make use of the logger feature



HERE = Path(__file__).parent

SCRIPTS_DIR = str(HERE.parent.joinpath("scripts").absolute())

import sys



sys.path.append(SCRIPTS_DIR)

sys.path.append(str(SCRIPTS_DIR))

import prepare_combined_format_inputs
@@ -657,18 +656,18 @@ class DecoderFrontend: 
            system = platform.system()



            if system == "Windows":

                eid_path = "./scripts/tools/Win32/eid-xor.exe"

                eid_path = SCRIPTS_DIR.joinpath("tools/Win32/eid-xor.exe")

            elif system == "Linux":

                eid_path = "./scripts/tools/Linux/eid-xor"

                eid_path = SCRIPTS_DIR.joinpath("tools/Linux/eid-xor")

            elif system == "Darwin":

                eid_path = "./scripts/tools/Darwin/eid-xor"

                eid_path = SCRIPTS_DIR.joinpath("tools/Darwin/eid-xor")

            else:

                raise ValueError(f'Wrong system "{system}"!')



            if not os.path.isfile(eid_path):

            if not eid_path.exists():

                raise FileNotFoundError(f"eid-xor binary {eid_path} not found!\n")



            eid_command = [eid_path]

            eid_command = [str(eid_path)]

            eid_command.extend(["-fer", "-vbr", "-bs", "g192", "-ep", "g192"])

            eid_output_suffix = "." + os.path.basename(plc_file) + ".fer"

            eid_command += [