From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 455D9A0571; Tue, 3 Mar 2020 17:15:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17EFD1BFF4; Tue, 3 Mar 2020 17:15:07 +0100 (CET) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by dpdk.org (Postfix) with ESMTP id A74271BFF0 for ; Tue, 3 Mar 2020 17:15:05 +0100 (CET) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 023G4M5P094370 for ; Tue, 3 Mar 2020 11:15:05 -0500 Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yhsv2j374-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Mar 2020 11:15:04 -0500 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 023GDE1a015507 for ; Tue, 3 Mar 2020 16:15:04 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma05wdc.us.ibm.com with ESMTP id 2yffk6cbb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Mar 2020 16:15:04 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 023GF3w98847808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Mar 2020 16:15:03 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A3DFBE053; Tue, 3 Mar 2020 16:15:03 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E322CBE058; Tue, 3 Mar 2020 16:15:02 +0000 (GMT) Received: from ltc17u1.stglabs.ibm.com (unknown [9.114.216.145]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 3 Mar 2020 16:15:02 +0000 (GMT) From: Thinh Tran To: dts@dpdk.org Cc: drc@linux.vnet.ibm.com, Thinh Tran Date: Tue, 3 Mar 2020 11:14:59 -0500 Message-Id: <20200303161459.118730-1-thinhtr@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-03_05:2020-03-03, 2020-03-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 suspectscore=1 spamscore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003030114 Subject: [dts] [PATCH] change execution path of DPDK examples X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" - There is a different way the DPDK examples getting built. In their Makefile, if the libdpdk package is installed ... # Build using pkg-config variables if possible ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) ... their binaries will be created under ./examples//build/ if not, they will be under both ./examples//build/ and ./examples//build/app/ - DTS test scripts should pick the common path of these binaries Signed-off-by: Thinh Tran --- tests/TestSuite_cbdma.py | 2 +- tests/TestSuite_cmdline.py | 2 +- tests/TestSuite_eventdev_pipeline.py | 2 +- tests/TestSuite_hello_world.py | 4 ++-- tests/TestSuite_kni.py | 2 +- tests/TestSuite_l2fwd.py | 6 +++--- tests/TestSuite_pvp_vhost_user_built_in_net_driver.py | 2 +- tests/TestSuite_short_live.py | 4 ++-- tests/TestSuite_timer.py | 2 +- tests/TestSuite_vhost_enqueue_interrupt.py | 2 +- tests/TestSuite_vhost_event_idx_interrupt.py | 2 +- tests/TestSuite_vhost_virtio_pmd_interrupt.py | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/TestSuite_cbdma.py b/tests/TestSuite_cbdma.py index fd9aec9..d7ca3ae 100644 --- a/tests/TestSuite_cbdma.py +++ b/tests/TestSuite_cbdma.py @@ -140,7 +140,7 @@ class TestCBDMA(TestCase): ''' # flush other output self.dut.get_session_output(timeout=1) - cmd_command = './examples/ioat/build/app/ioatfwd ' + eal_params + \ + cmd_command = './examples/ioat/build/ioatfwd ' + eal_params + \ '-- -p %s -q %d %s -c %s' % (hex(port_info), self.cbdma_ioat_dev_num/self.cbdma_nic_dev_num, mac_info, self.cbdma_copy_mode) diff --git a/tests/TestSuite_cmdline.py b/tests/TestSuite_cmdline.py index 9bf6850..ab30d8e 100644 --- a/tests/TestSuite_cmdline.py +++ b/tests/TestSuite_cmdline.py @@ -57,7 +57,7 @@ class TestCmdline(TestCase): # Run cmdline app cores = self.dut.get_core_list('1S/1C/1T') coreMask = utils.create_mask(cores) - self.dut.send_expect("./examples/cmdline/build/app/cmdline -n 1 -c " + coreMask, "> ", 10) + self.dut.send_expect("./examples/cmdline/build/cmdline -n 1 -c " + coreMask, "> ", 10) def set_up(self): """ diff --git a/tests/TestSuite_eventdev_pipeline.py b/tests/TestSuite_eventdev_pipeline.py index 4818fc4..b0b3b8b 100644 --- a/tests/TestSuite_eventdev_pipeline.py +++ b/tests/TestSuite_eventdev_pipeline.py @@ -98,7 +98,7 @@ class TestEventdevPipeline(TestCase): eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=[self.dut.ports_info[0]['pci']]) command_line = "taskset -c %s " + self.app_command + \ - "/build/app/eventdev_pipeline %s " + \ + "/build/eventdev_pipeline %s " + \ "--vdev event_sw0 -- -r%s -t%s -e%s -w %s -s1 -n0 -c32 -W1000 %s -D" command_line = command_line % ( self.taskset_core_list, eal_params, self.core_mask_rx, diff --git a/tests/TestSuite_hello_world.py b/tests/TestSuite_hello_world.py index 3f29e60..3d58e2a 100644 --- a/tests/TestSuite_hello_world.py +++ b/tests/TestSuite_hello_world.py @@ -66,7 +66,7 @@ class TestHelloWorld(TestCase): # get the mask for the first core cores = self.dut.get_core_list('1S/1C/1T') coreMask = utils.create_mask(cores) - cmdline = "./examples/helloworld/build/app/helloworld -n 1 -c " + coreMask + cmdline = "./examples/helloworld/build/helloworld -n 1 -c " + coreMask out = self.dut.send_expect(cmdline, "# ", 30) self.verify("hello from core %s" % cores[0] in out, "EAL not started on core%s" % cores[0]) @@ -87,7 +87,7 @@ class TestHelloWorld(TestCase): coreMask = utils.create_mask(cores[:available_max_lcore - 1]) - cmdline = "./examples/helloworld/build/app/helloworld -n 1 -c " + coreMask + cmdline = "./examples/helloworld/build/helloworld -n 1 -c " + coreMask out = self.dut.send_expect(cmdline, "# ", 50) for i in range(available_max_lcore - 1): self.verify("hello from core %s" % cores[i] in out, "EAL not started on core%s" % cores[i]) diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index f611383..3cbd457 100644 --- a/tests/TestSuite_kni.py +++ b/tests/TestSuite_kni.py @@ -341,7 +341,7 @@ class TestKni(TestCase): config_param = self.build_config_param() out_kni = self.dut.send_expect( - './examples/kni/build/app/kni -c %s -n %d -- -P -p %s %s -m &' % + './examples/kni/build/kni -c %s -n %d -- -P -p %s %s -m &' % (core_mask, self.dut.get_memory_channels(), port_mask, config_param), "Link Up", 20) diff --git a/tests/TestSuite_l2fwd.py b/tests/TestSuite_l2fwd.py index 382ec60..4a47c02 100644 --- a/tests/TestSuite_l2fwd.py +++ b/tests/TestSuite_l2fwd.py @@ -108,7 +108,7 @@ class TestL2fwd(TestCase): port_mask = utils.create_mask([self.dut_ports[0], self.dut_ports[1]]) eal_params = self.dut.create_eal_parameters() - self.dut.send_expect("./examples/l2fwd/build/app/l2fwd %s -- -q 8 -p %s &" % (eal_params, port_mask), + self.dut.send_expect("./examples/l2fwd/build/l2fwd %s -- -q 8 -p %s &" % (eal_params, port_mask), "L2FWD: entering main loop", 60) for i in [0, 1]: @@ -144,7 +144,7 @@ class TestL2fwd(TestCase): eal_params = self.dut.create_eal_parameters(cores=cores) for queues in self.test_queues: - command_line = "./examples/l2fwd/build/app/l2fwd %s -- -q %s -p %s &" % \ + command_line = "./examples/l2fwd/build/l2fwd %s -- -q %s -p %s &" % \ (eal_params, str(queues['queues']), port_mask) self.dut.send_expect(command_line, "L2FWD: entering main loop", 60) @@ -193,7 +193,7 @@ class TestL2fwd(TestCase): for queues in self.test_queues: - command_line = "./examples/l2fwd/build/app/l2fwd %s -- -q %s -p %s &" % \ + command_line = "./examples/l2fwd/build/l2fwd %s -- -q %s -p %s &" % \ (eal_params, str(queues['queues']), port_mask) # self.dut.send_expect(command_line, "memory mapped", 60) diff --git a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py index 528f0d7..cfdd704 100644 --- a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py +++ b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py @@ -172,7 +172,7 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase): """ self.dut.send_expect("rm -rf ./vhost.out", "#") eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_vhost_user, prefix='vhost') - command_line_client = "./examples/vhost/build/app/vhost-switch " + eal_param + ' -- -p 0x1 --mergeable 0 --vm2vm 1 --builtin-net-driver --socket-file ./vhost-net> ./vhost.out &' + command_line_client = "./examples/vhost/build/vhost-switch " + eal_param + ' -- -p 0x1 --mergeable 0 --vm2vm 1 --builtin-net-driver --socket-file ./vhost-net> ./vhost.out &' self.vhost_switch.send_expect(command_line_client, "# ", 120) time.sleep(15) try: diff --git a/tests/TestSuite_short_live.py b/tests/TestSuite_short_live.py index 31adf0d..a4358ff 100644 --- a/tests/TestSuite_short_live.py +++ b/tests/TestSuite_short_live.py @@ -193,7 +193,7 @@ class TestShortLiveApp(TestCase): for i in range(repeat_time): #dpdk start print("clean_up_with_signal_l2fwd round %d" % (i + 1)) - self.dut.send_expect("./examples/l2fwd/build/app/l2fwd -n 4 -c 0xf -- -p 0x3 &", "L2FWD: entering main loop", 60) + self.dut.send_expect("./examples/l2fwd/build/l2fwd -n 4 -c 0xf -- -p 0x3 &", "L2FWD: entering main loop", 60) self.check_forwarding([0, 1], self.nic) # kill with different Signal @@ -209,7 +209,7 @@ class TestShortLiveApp(TestCase): for i in range(repeat_time): #dpdk start print("clean_up_with_signal_l3fwd round %d" % (i + 1)) - self.dut.send_expect("./examples/l3fwd/build/app/l3fwd -n 4 -c 0xf -- -p 0x3 --config='(0,0,1),(1,0,2)' &", "L3FWD: entering main loop", 120) + self.dut.send_expect("./examples/l3fwd/build/l3fwd -n 4 -c 0xf -- -p 0x3 --config='(0,0,1),(1,0,2)' &", "L3FWD: entering main loop", 120) self.check_forwarding([0, 0], self.nic) # kill with different Signal diff --git a/tests/TestSuite_timer.py b/tests/TestSuite_timer.py index f73bb77..4d0434e 100644 --- a/tests/TestSuite_timer.py +++ b/tests/TestSuite_timer.py @@ -72,7 +72,7 @@ class TestTimer(TestCase): coreMask = utils.create_mask(cores) # run timer on the background - cmdline = "./examples/timer/build/app/timer -n 1 -c " + coreMask + " &" + cmdline = "./examples/timer/build/timer -n 1 -c " + coreMask + " &" self.dut.send_expect(cmdline, "# ", 1) time.sleep(15) diff --git a/tests/TestSuite_vhost_enqueue_interrupt.py b/tests/TestSuite_vhost_enqueue_interrupt.py index da325d3..509c7f3 100644 --- a/tests/TestSuite_vhost_enqueue_interrupt.py +++ b/tests/TestSuite_vhost_enqueue_interrupt.py @@ -108,7 +108,7 @@ class TestVhostEnqueueInterrupt(TestCase): info = {'core': self.core_list_l3fwd[i], 'port': 0, 'queue': i} self.verify_info.append(info) - example_cmd = "./examples/l3fwd-power/build/app/l3fwd-power " + example_cmd = "./examples/l3fwd-power/build/l3fwd-power " vdev = [r"'net_vhost0,iface=vhost-net,queues=%d,client=1'" % self.queues] para = " -- -p 0x1 --parse-ptype 1 --config '%s' " % config_info eal_params = self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True, ports=[self.pci_info], vdevs=vdev) diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py index 38cdc77..fb7da60 100644 --- a/tests/TestSuite_vhost_event_idx_interrupt.py +++ b/tests/TestSuite_vhost_event_idx_interrupt.py @@ -106,7 +106,7 @@ class TestVhostEventIdxInterrupt(TestCase): port_info = "0x1" if self.vm_num == 1 else "0x3" - example_para = "./examples/l3fwd-power/build/app/l3fwd-power " + example_para = "./examples/l3fwd-power/build/l3fwd-power " para = " --log-level=9 %s -- -p %s --parse-ptype 1 --config '%s'" % (vdev_info, port_info, config_info) eal_params = self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True) command_line_client = example_para + eal_params + para diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py index bf97a91..5e6437e 100644 --- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py +++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py @@ -144,7 +144,7 @@ class TestVhostVirtioPmdInterrupt(TestCase): info = {'core': core_list_l3fwd[queue], 'port': 0, 'queue': queue} self.verify_info.append(info) - command_client = "./examples/l3fwd-power/build/app/l3fwd-power " + \ + command_client = "./examples/l3fwd-power/build/l3fwd-power " + \ "-c %s -n 4 --log-level='user1,7' -- -p 1 -P " + \ "--config '%s' --no-numa --parse-ptype " command_line_client = command_client % (core_mask_l3fwd, config_info) -- 2.17.0