Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/105881
Subject: [V1] tests/*: removed changing source code before meson build

_Apply issues_

Diff:
	tests/TestSuite_ptpclient.py
	tests/TestSuite_power_pbf.py
	tests/TestSuite_nic_single_core_perf.py
	tests/TestSuite_ieee1588.py
	framework/project_dpdk.py

DPDK:
	commit 8a5a91401dc23ddab1ddea3667a17a615a25077f
	Author: Stephen Hemminger <stephen@networkplumber.org>
	Date:   Thu Dec 23 11:21:58 2021 -0800
	Comment: eal/linux: log hugepage create errors with filename

DTS:
	commit 993d581241982f0f5b920c928053f898707726b9
	Author: Lingli Chen <linglix.chen@intel.com>
	Date:   Mon Jan 24 16:57:06 2022 +0800
	Comment: tests/loopback_virtio_user_server_mode: Modify case sync with testplan

DTS git baseline:
	Repo:dts, CommitID: 993d581241982f0f5b920c928053f898707726b9



* Repo: dts
Auto-merging tests/TestSuite_nic_single_core_perf.py
Auto-merging framework/project_dpdk.py
CONFLICT (content): Merge conflict in framework/project_dpdk.py
error: Failed to merge in the changes.
Patch failed at 0001 tests/*: removed changing source code before meson build
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