* [dts-test-report] |FAILURE| pw(113413) sid(23754) job(DTS_AUTO_1271) [V1] tests/multiprocess_iavf: synchronize case and testplan
@ 2022-06-24 13:59 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2022-06-24 13:59 UTC (permalink / raw)
To: test-report, dts-test-report
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/113413
Subject: [V1] tests/multiprocess_iavf: synchronize case and testplan
_Apply issues_
Diff:
tests/TestSuite_multiprocess_iavf.py
DPDK:
commit 42fbb8e85d1f0b6c1d397d4e7559bc5877ba985e
Author: Don Wallwork <donw@xsightlabs.com>
Date: Thu Jun 23 07:21:27 2022 -0400
Comment: eal/linux: allocate worker lcore stacks in hugepages
DTS:
commit 5b1f1f829daad677af5b513b52e066b7d91e46ed
Author: Lijuan Tu <lijuan.tu@intel.com>
Date: Wed Nov 3 01:27:02 2021 +0800
Comment: version: 21.08.0
DTS git baseline:
Repo:dts, CommitID: 5b1f1f829daad677af5b513b52e066b7d91e46ed
* Repo: dts
A tests/TestSuite_multiprocess_iavf.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/TestSuite_multiprocess_iavf.py deleted in HEAD and modified in tests/multiprocess_iavf: synchronize case and testplan. Version tests/multiprocess_iavf: synchronize case and testplan of tests/TestSuite_multiprocess_iavf.py left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 tests/multiprocess_iavf: synchronize case and testplan
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
DPDK STV team
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-24 13:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-24 13:59 [dts-test-report] |FAILURE| pw(113413) sid(23754) job(DTS_AUTO_1271) [V1] tests/multiprocess_iavf: synchronize case and testplan sys_stv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).