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

Merge branch 'main' into ci/complexity-measurement-2

parents 9274eeba be261767

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ stages: 


    ### run pytest

    - exit_code=0

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --ssnr --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --ssnr --odg --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - python3 scripts/parse_xml_report.py report-junit.xml $MLD_ARTIFACT_NAME

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ CFLAGS += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long \ 
            -Wno-implicit-fallthrough -ffp-contract=off

# to be uncommented in CI

# CFLAGS += -Werror

CFLAGS += -Winit-self

CFLAGS += -Wunused-but-set-variable



# libs to link

LDLIBS   += -lm

Workspace_msvc/lib_com.vcxproj

+3 −2
Original line number Diff line number Diff line
@@ -388,8 +388,10 @@ 
    <ClInclude Include="..\lib_com\cnst.h" />

    <ClInclude Include="..\lib_com\common_api_types.h" />

    <ClInclude Include="..\lib_com\control.h" />

    <ClInclude Include="..\lib_com\count.h" />

    <ClInclude Include="..\lib_com\enh1632.h" />

    <ClInclude Include="..\lib_com\enh40.h" />

    <ClInclude Include="..\lib_com\enhUL32.h" />

    <ClInclude Include="..\lib_com\ivas_cnst.h" />

    <ClInclude Include="..\lib_com\ivas_error.h" />

    <ClInclude Include="..\lib_com\ivas_error_utils.h" />
@@ -399,8 +401,7 @@ 
    <ClInclude Include="..\lib_com\move.h" />

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\prot.h" />

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\prot_fx.h" />

    <ClInclude Include="..\lib_com\rom_basop_util.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h" />

Workspace_msvc/lib_com.vcxproj.filters

+7 −2
Original line number Diff line number Diff line
@@ -593,11 +593,16 @@ 
    <ClInclude Include="..\lib_com\rom_basop_util.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx.h" />

    <ClInclude Include="..\lib_com\count.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\enhUL32.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

Workspace_msvc/renderer.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>