From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 2DECB2BAC for ; Mon, 21 Nov 2016 08:42:48 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 30C13AD7; Sun, 20 Nov 2016 23:42:47 -0800 (PST) Received: from ubuntu-jianbo.shanghai.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BA0BB3F24D; Sun, 20 Nov 2016 23:42:46 -0800 (PST) From: Jianbo Liu To: dts@dpdk.org Cc: Jianbo Liu Date: Mon, 21 Nov 2016 15:42:38 +0800 Message-Id: <1479714160-4803-1-git-send-email-jianbo.liu@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479450059-17753-1-git-send-email-jianbo.liu@linaro.org> References: <1479450059-17753-1-git-send-email-jianbo.liu@linaro.org> Subject: [dts] [PATCH v2 1/3] tests unit_test_*: specify the coremask to use fewer DUT's cores 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: , X-List-Received-Date: Mon, 21 Nov 2016 07:42:48 -0000 The coremask (now is ffff) for applications is too large, reduce to f. Signed-off-by: Jianbo Liu --- tests/TestSuite_unit_tests_cmdline.py | 2 +- tests/TestSuite_unit_tests_dump.py | 12 ++++++------ tests/TestSuite_unit_tests_eal.py | 6 +++--- tests/TestSuite_unit_tests_lpm.py | 6 +++--- tests/TestSuite_unit_tests_mbuf.py | 2 +- tests/TestSuite_unit_tests_mempool.py | 4 ++-- tests/TestSuite_unit_tests_pmd_perf.py | 8 ++++---- tests/TestSuite_unit_tests_qos.py | 8 ++++---- tests/TestSuite_unit_tests_ring.py | 4 ++-- tests/TestSuite_unit_tests_ringpmd.py | 4 ++-- tests/TestSuite_unit_tests_timer.py | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/TestSuite_unit_tests_cmdline.py b/tests/TestSuite_unit_tests_cmdline.py index 93faf49..57111e4 100644 --- a/tests/TestSuite_unit_tests_cmdline.py +++ b/tests/TestSuite_unit_tests_cmdline.py @@ -69,7 +69,7 @@ class TestUnitTestsCmdline(TestCase): Run cmdline autotests in RTE comand line. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("cmdline_autotest", "RTE>>", 60) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py index 08c3ba6..a39fcd1 100644 --- a/tests/TestSuite_unit_tests_dump.py +++ b/tests/TestSuite_unit_tests_dump.py @@ -76,7 +76,7 @@ class TestUnitTestsDump(TestCase): """ Run history log dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) + self.dut.send_expect("./%s/app/test -n 1 -c f" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_log_history", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") self.verify("EAL" in out, "Test failed") @@ -112,7 +112,7 @@ class TestUnitTestsDump(TestCase): """ Run physical memory dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) + self.dut.send_expect("./%s/app/test -n 1 -c f" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") elements = ['Segment', 'phys', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank'] @@ -132,7 +132,7 @@ class TestUnitTestsDump(TestCase): """ Run memzone dump test case. """ - self.dut.send_expect("./%s/app/testpmd -n 1 -c ffff -- -i" % (self.target), "testpmd>", self.start_test_time) + self.dut.send_expect("./%s/app/testpmd -n 1 -c f -- -i" % (self.target), "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") @@ -154,7 +154,7 @@ class TestUnitTestsDump(TestCase): """ Run struct size dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) + self.dut.send_expect("./%s/app/test -n 1 -c f" % (self.target), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_struct_sizes", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") @@ -173,14 +173,14 @@ class TestUnitTestsDump(TestCase): """ test_port = self.dut_ports[0] pci_address = self.dut.ports_info[test_port]['pci']; - self.dut.send_expect("./%s/app/test -n 1 -c ffff -b %s" + self.dut.send_expect("./%s/app/test -n 1 -c f -b %s" % (self.target, pci_address), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") black_str = "PCI blacklist %s" % pci_address self.verify(black_str in out, "Dump black list failed") - self.dut.send_expect("./%s/app/test -n 1 -c ffff -w %s" + self.dut.send_expect("./%s/app/test -n 1 -c f -w %s" % (self.target, pci_address), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") diff --git a/tests/TestSuite_unit_tests_eal.py b/tests/TestSuite_unit_tests_eal.py index 8fea148..d27ba39 100644 --- a/tests/TestSuite_unit_tests_eal.py +++ b/tests/TestSuite_unit_tests_eal.py @@ -34,7 +34,7 @@ class TestUnitTestsEal(TestCase): [arch, machine, self.env, toolchain] = self.target.split('-') self.start_test_time = 60 self.run_cmd_time = 180 - self.test_app_cmdline = "./%s/app/test -n 1 -c ffff" % self.target + self.test_app_cmdline = "./%s/app/test -n 1 -c f" % self.target def set_up(self): """ @@ -147,7 +147,7 @@ class TestUnitTestsEal(TestCase): cmdline = self.test_app_cmdline else: # mask cores only on socket 0 - cmdline = "%s ./%s/app/test -n 1 -c 5555" % (self.dut.taskset(1), self.target) + cmdline = "%s ./%s/app/test -n 1 -c 5" % (self.dut.taskset(1), self.target) self.dut.send_expect(cmdline, "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("func_reentrancy_autotest", "RTE>>", self.run_cmd_time) self.dut.send_expect("quit", "# ") @@ -158,7 +158,7 @@ class TestUnitTestsEal(TestCase): Run pci autotest. """ # should re-compile test app, this is only a demo. will implementation after framework support - self.dut.send_expect("./%s/app/test_pci -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>" , self.start_test_time) + self.dut.send_expect("./%s/app/test_pci -n 1 -c f" % self.target, "R.*T.*E.*>.*>" , self.start_test_time) out = self.dut.send_expect("pci_autotest", "RTE>>", self.run_cmd_time) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_lpm.py b/tests/TestSuite_unit_tests_lpm.py index 4a26e03..e8149ff 100644 --- a/tests/TestSuite_unit_tests_lpm.py +++ b/tests/TestSuite_unit_tests_lpm.py @@ -70,7 +70,7 @@ class TestUnitTestsLpmIpv6(TestCase): """ Run lpm for IPv6 autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("lpm_autotest", "RTE>>", 120) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -80,7 +80,7 @@ class TestUnitTestsLpmIpv6(TestCase): Run lpm for IPv6 autotest. """ [arch, machine, env, toolchain] = self.target.split('-') - self.verify(arch == "x86_64", "lpm6 request huge memory") + self.verify(arch in ["x86_64", "arm64"], "lpm6 request huge memory") if env == 'bsdapp': pass else: @@ -89,7 +89,7 @@ class TestUnitTestsLpmIpv6(TestCase): hugepage_num = self.dut.get_total_huge_pages() self.verify(hugepage_num >= 4096, "failed to request huge memory") - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("lpm6_autotest", "RTE>>", 3600) self.dut.send_expect("quit", "# ") if env == 'bsdapp': diff --git a/tests/TestSuite_unit_tests_mbuf.py b/tests/TestSuite_unit_tests_mbuf.py index df73e5d..4fd660d 100644 --- a/tests/TestSuite_unit_tests_mbuf.py +++ b/tests/TestSuite_unit_tests_mbuf.py @@ -68,7 +68,7 @@ class TestUnitTestsMbuf(TestCase): Run mbuf autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("mbuf_autotest", "RTE>>", 60) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_mempool.py b/tests/TestSuite_unit_tests_mempool.py index 70cf4f3..42129e5 100644 --- a/tests/TestSuite_unit_tests_mempool.py +++ b/tests/TestSuite_unit_tests_mempool.py @@ -68,7 +68,7 @@ class TestUnitTestsMempool(TestCase): Run memory pool autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("mempool_autotest", "RTE>>", 120) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -77,7 +77,7 @@ class TestUnitTestsMempool(TestCase): """ Run memory pool performance autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c fffe" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c e" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("mempool_perf_autotest", "RTE>>", 700) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_pmd_perf.py b/tests/TestSuite_unit_tests_pmd_perf.py index 695c8de..a3284a0 100644 --- a/tests/TestSuite_unit_tests_pmd_perf.py +++ b/tests/TestSuite_unit_tests_pmd_perf.py @@ -62,7 +62,7 @@ class TestUnitTestsPmdPerf(TestCase): self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing") [self.arch, machine, env, toolchain] = self.target.split('-') - self.verify(self.arch == "x86_64", "pmd perf request running in x86_64") + self.verify(self.arch in ["x86_64", "arm64"], "pmd perf request running in x86_64 or arm64") self.burst_ctlmodes = ['poll_before_xmit', 'poll_after_xmit'] self.rxtx_modes = ['vector', 'scalar', 'full', 'hybrid'] self.anchors = ['rxtx', 'rxonly', 'txonly'] @@ -90,7 +90,7 @@ class TestUnitTestsPmdPerf(TestCase): Run pmd stream control mode burst test case. """ - self.dut.send_expect("./app/test/test -n 1 -c ffff", "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./app/test/test -n 1 -c f", "R.*T.*E.*>.*>", 60) for mode in self.burst_ctlmodes: self.dut.send_expect("set_rxtx_sc %s" % mode, "RTE>>", 10) out = self.dut.send_expect("pmd_perf_autotest", "RTE>>", 120) @@ -113,9 +113,9 @@ class TestUnitTestsPmdPerf(TestCase): for mode in self.rxtx_modes: if mode is "scalar": - self.dut.send_expect("./app/test/test_scalar -n 1 -c ffff", "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./app/test/test_scalar -n 1 -c f", "R.*T.*E.*>.*>", 60) else: - self.dut.send_expect("./app/test/test -n 1 -c ffff", "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./app/test/test -n 1 -c f", "R.*T.*E.*>.*>", 60) table_row = [mode] self.dut.send_expect("set_rxtx_sc continuous", "RTE>>", 10) diff --git a/tests/TestSuite_unit_tests_qos.py b/tests/TestSuite_unit_tests_qos.py index 1bc5f8d..2c29db6 100644 --- a/tests/TestSuite_unit_tests_qos.py +++ b/tests/TestSuite_unit_tests_qos.py @@ -70,7 +70,7 @@ class TestUnitTestsQos(TestCase): Run RED autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 30) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 30) out = self.dut.send_expect("red_autotest", "RTE>>", 180) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -80,7 +80,7 @@ class TestUnitTestsQos(TestCase): Run meter autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 30) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 30) out = self.dut.send_expect("meter_autotest", "RTE>>", 5) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -91,9 +91,9 @@ class TestUnitTestsQos(TestCase): """ [arch, machine, env, toolchain] = self.target.split('-') - self.verify(arch == "x86_64", "Sched auto_test not support in i686") + self.verify(arch in ["x86_64" ,"arm64"], "Sched auto_test only support in x86_64 or arm64") - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 30) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 30) out = self.dut.send_expect("sched_autotest", "RTE>>", 5) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_ring.py b/tests/TestSuite_unit_tests_ring.py index baa6610..9ef39fa 100644 --- a/tests/TestSuite_unit_tests_ring.py +++ b/tests/TestSuite_unit_tests_ring.py @@ -68,7 +68,7 @@ class TestUnitTestsRing(TestCase): Run ring autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("ring_autotest", "RTE>>", 36000) self.verify("Test OK" in out, "Test failed") self.dut.send_expect("set_watermark test 100", "RTE>>") @@ -81,7 +81,7 @@ class TestUnitTestsRing(TestCase): Run ring performance autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c fffe" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c e" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("ring_perf_autotest", "RTE>>", 210) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_unit_tests_ringpmd.py b/tests/TestSuite_unit_tests_ringpmd.py index b6d21bb..e82bd1d 100644 --- a/tests/TestSuite_unit_tests_ringpmd.py +++ b/tests/TestSuite_unit_tests_ringpmd.py @@ -71,12 +71,12 @@ class TestUnitTestsRingPmd(TestCase): """ dev_str = "--vdev=net_ring0 --vdev=net_ring1" - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 10) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 10) out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Default no eth_ring devices Test failed") - self.dut.send_expect("./%s/app/test -n 1 -c ffff %s" % (self.target, dev_str), "R.*T.*E.*>.*>", 10) + self.dut.send_expect("./%s/app/test -n 1 -c f %s" % (self.target, dev_str), "R.*T.*E.*>.*>", 10) out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Two eth_ring devices test failed") diff --git a/tests/TestSuite_unit_tests_timer.py b/tests/TestSuite_unit_tests_timer.py index 2d5eb49..e3597b8 100644 --- a/tests/TestSuite_unit_tests_timer.py +++ b/tests/TestSuite_unit_tests_timer.py @@ -67,7 +67,7 @@ class TestUnitTestsTimer(TestCase): """ Run timer autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("timer_autotest", "RTE>>", 60) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -76,7 +76,7 @@ class TestUnitTestsTimer(TestCase): """ Run timer autotest. """ - self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("timer_perf_autotest", "RTE>>", 60) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") -- 1.9.1