|WARNING| pw104126-104130 [PATCH] [5/5] build: select optional libraries

|WARNING| pw104126-104130 [PATCH] [5/5] build: select optional libraries

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 6162 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/104126

_apply patch failure_

Submitter: David Marchand <david.marchand@redhat.com>
Date: Wednesday, November 10 2021 16:48:14 
Applied on: CommitID:f4801fdb7828f45ddc4ada148b1b0a230a226570
Apply patch set 104126-104130 failed:

Checking patch .ci/linux-build.sh...
Hunk #1 succeeded at 83 (offset -4 lines).
Checking patch .github/workflows/build.yml...
error: while searching for:
      CC: ccache ${{ matrix.config.compiler }}
      DEF_LIB: ${{ matrix.config.library }}
      LIBABIGAIL_VERSION: libabigail-1.8
      PPC64LE: ${{ matrix.config.cross == 'ppc64le' }}
      REF_GIT_TAG: none
      RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }}

error: patch failed: .github/workflows/build.yml:21
Hunk #2 succeeded at 31 (offset -2 lines).
Checking patch devtools/test-meson-builds.sh...
Applied patch .ci/linux-build.sh cleanly.
Applying patch .github/workflows/build.yml with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch devtools/test-meson-builds.sh cleanly.
diff a/.github/workflows/build.yml b/.github/workflows/build.yml	(rejected hunks)
@@ -21,6 +21,7 @@ jobs:
       CC: ccache ${{ matrix.config.compiler }}
       DEF_LIB: ${{ matrix.config.library }}
       LIBABIGAIL_VERSION: libabigail-1.8
+      NO_OPTIONAL_LIBS: ${{ matrix.config.no_optional_libs != '' }}
       PPC64LE: ${{ matrix.config.cross == 'ppc64le' }}
       REF_GIT_TAG: none
       RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }}
Checking patch app/test-pmd/cmdline.c...
Checking patch app/test-pmd/config.c...
Checking patch app/test-pmd/csumonly.c...
Checking patch app/test-pmd/meson.build...
error: while searching for:
    ext_deps += jansson_dep
endif

deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'bus_pci']
if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
    deps += 'crypto_scheduler'
endif

error: patch failed: app/test-pmd/meson.build:32
Hunk #2 succeeded at 39 (offset -4 lines).
Checking patch app/test-pmd/testpmd.c...
Checking patch app/test-pmd/testpmd.h...
Checking patch lib/meson.build...
Applied patch app/test-pmd/cmdline.c cleanly.
Applied patch app/test-pmd/config.c cleanly.
Applied patch app/test-pmd/csumonly.c cleanly.
Applying patch app/test-pmd/meson.build with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch app/test-pmd/testpmd.c cleanly.
Applied patch app/test-pmd/testpmd.h cleanly.
Applied patch lib/meson.build cleanly.
diff a/app/test-pmd/meson.build b/app/test-pmd/meson.build	(rejected hunks)
@@ -32,7 +32,7 @@ if dpdk_conf.has('RTE_HAS_JANSSON')
     ext_deps += jansson_dep
 endif
 
-deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'bus_pci']
+deps += ['ethdev', 'cmdline', 'metrics', 'bus_pci']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
     deps += 'crypto_scheduler'
 endif
Checking patch app/proc-info/main.c...
Checking patch app/proc-info/meson.build...
Checking patch app/test-pmd/meson.build...
error: app/test-pmd/meson.build: does not match index
Checking patch app/test-pmd/testpmd.c...
error: app/test-pmd/testpmd.c: does not match index
Checking patch app/test/meson.build...
Hunk #4 succeeded at 276 (offset -1 lines).
Hunk #5 succeeded at 372 (offset -1 lines).
error: while searching for:
    test_sources += 'test_pmd_ring_perf.c'
    test_sources += 'test_pmd_ring.c'
    test_sources += 'test_event_eth_tx_adapter.c'
    test_sources += 'test_bitratestats.c'
    test_sources += 'test_latencystats.c'
    test_sources += 'sample_packet_forward.c'
    test_sources += 'test_pdump.c'
    fast_tests += [['ring_pmd_autotest', true]]
    perf_test_names += 'ring_pmd_perf_autotest'
    fast_tests += [['event_eth_tx_adapter_autotest', false]]
    fast_tests += [['bitratestats_autotest', true]]
    fast_tests += [['latencystats_autotest', true]]
    fast_tests += [['pdump_autotest', true]]
endif

if dpdk_conf.has('RTE_HAS_LIBPCAP')

error: patch failed: app/test/meson.build:399
Checking patch lib/meson.build...
error: lib/meson.build: does not match index
Applied patch app/proc-info/main.c cleanly.
Applied patch app/proc-info/meson.build cleanly.
Applying patch app/test/meson.build with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
diff a/app/test/meson.build b/app/test/meson.build	(rejected hunks)
@@ -399,16 +399,22 @@ if dpdk_conf.has('RTE_NET_RING')
     test_sources += 'test_pmd_ring_perf.c'
     test_sources += 'test_pmd_ring.c'
     test_sources += 'test_event_eth_tx_adapter.c'
-    test_sources += 'test_bitratestats.c'
-    test_sources += 'test_latencystats.c'
     test_sources += 'sample_packet_forward.c'
     test_sources += 'test_pdump.c'
     fast_tests += [['ring_pmd_autotest', true]]
     perf_test_names += 'ring_pmd_perf_autotest'
     fast_tests += [['event_eth_tx_adapter_autotest', false]]
-    fast_tests += [['bitratestats_autotest', true]]
-    fast_tests += [['latencystats_autotest', true]]
     fast_tests += [['pdump_autotest', true]]
+    if dpdk_conf.has('RTE_LIB_BITRATESTATS')
+        test_deps += 'bitratestats'
+        test_sources += 'test_bitratestats.c'
+        fast_tests += [['bitratestats_autotest', true]]
+    endif
+    if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
+        test_deps += 'latencystats'
+        test_sources += 'test_latencystats.c'
+        fast_tests += [['latencystats_autotest', true]]
+    endif
 endif
 
 if dpdk_conf.has('RTE_HAS_LIBPCAP')
Checking patch app/meson.build...
Checking patch app/test/meson.build...
error: app/test/meson.build: does not match index
Checking patch lib/meson.build...
error: lib/meson.build: does not match index
Applied patch app/meson.build cleanly.
Checking patch buildtools/chkincs/meson.build...
Checking patch lib/meson.build...
error: lib/meson.build: does not match index
Checking patch meson.build...
Checking patch meson_options.txt...
Applied patch buildtools/chkincs/meson.build cleanly.
Applied patch meson.build cleanly.
Applied patch meson_options.txt cleanly.

https://lab.dpdk.org/results/dashboard/patchsets/20142/

UNH-IOL DPDK Community Lab