From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 9DAEA4B79 for ; Fri, 14 Oct 2016 16:56:43 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 14 Oct 2016 07:56:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,493,1473145200"; d="scan'208";a="1064827132" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga002.jf.intel.com with ESMTP; 14 Oct 2016 07:56:43 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Oct 2016 07:56:42 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Oct 2016 07:56:41 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.139]) by shsmsx102.ccr.corp.intel.com ([169.254.2.206]) with mapi id 14.03.0248.002; Fri, 14 Oct 2016 22:56:37 +0800 From: "Liu, Yong" To: "Xu, HuilongX" , "dts@dpdk.org" CC: "Xu, HuilongX" Thread-Topic: [dts] [PATCH V1] remove re-compile test app in unit test Thread-Index: AQHSJRoIxV0yBG5n/ky2V54yLbzA76CoC+Hw Date: Fri, 14 Oct 2016 14:56:37 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E60300B57@SHSMSX103.ccr.corp.intel.com> References: <1476339736-3191-1-git-send-email-huilongx.xu@intel.com> In-Reply-To: <1476339736-3191-1-git-send-email-huilongx.xu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZWUwNDJkYTItMWI2YS00OTVmLThhNGYtYzM0ODJiZTUwMjMxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IlZjZEFuekVuemVZcVJOakdXT3d1VndPWEREYWllblFZV1pidUxtWVk4bEk9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] remove re-compile test app in unit test 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: Fri, 14 Oct 2016 14:56:44 -0000 Thanks huilong, applied into master branch. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,huilong > Sent: Thursday, October 13, 2016 1:22 AM > To: dts@dpdk.org > Cc: Xu, HuilongX > Subject: [dts] [PATCH V1] remove re-compile test app in unit test >=20 > all unit test suit will re-compile test app, > So used RTE_SDK/RTE_TARGET/app/test to replace RTE_SDK/app/test/test > for run unit test case. and not need re-compile test app. >=20 > Signed-off-by: xu,huilong > --- > tests/TestSuite_unit_tests_cmdline.py | 9 +--- > tests/TestSuite_unit_tests_eal.py | 80 +++++++++++++++++------------= - > ----- > tests/TestSuite_unit_tests_kni.py | 4 +- > tests/TestSuite_unit_tests_lpm.py | 8 ++-- > tests/TestSuite_unit_tests_mbuf.py | 6 +-- > tests/TestSuite_unit_tests_mempool.py | 8 ++-- > tests/TestSuite_unit_tests_power.py | 8 ++-- > tests/TestSuite_unit_tests_qos.py | 10 ++--- > tests/TestSuite_unit_tests_ring.py | 8 ++-- > tests/TestSuite_unit_tests_timer.py | 8 ++-- > 10 files changed, 62 insertions(+), 87 deletions(-) >=20 > diff --git a/tests/TestSuite_unit_tests_cmdline.py > b/tests/TestSuite_unit_tests_cmdline.py > index e3a29ee..93faf49 100644 > --- a/tests/TestSuite_unit_tests_cmdline.py > +++ b/tests/TestSuite_unit_tests_cmdline.py > @@ -57,12 +57,7 @@ class TestUnitTestsCmdline(TestCase): > Run at the start of each test suite. > """ > # icc compilation cost long long time. > - if "icc" in self.target: > - out =3D self.dut.send_expect("make -j -C ./app/test/", "# ", > 300) > - else: > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -74,7 +69,7 @@ class TestUnitTestsCmdline(TestCase): > Run cmdline autotests in RTE comand line. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D 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_eal.py > b/tests/TestSuite_unit_tests_eal.py > index e8ea20b..8fea148 100644 > --- a/tests/TestSuite_unit_tests_eal.py > +++ b/tests/TestSuite_unit_tests_eal.py > @@ -31,14 +31,10 @@ class TestUnitTestsEal(TestCase): > Run at the start of each test suite. > """ > # icc compilation cost long long time. > - if "icc" in self.target: > - out =3D self.dut.send_expect("make -j -C ./app/test/", "# ", > 300) > - else: > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > [arch, machine, self.env, toolchain] =3D self.target.split('-') > self.start_test_time =3D 60 > self.run_cmd_time =3D 180 > + self.test_app_cmdline =3D "./%s/app/test -n 1 -c ffff" % > self.target >=20 > def set_up(self): > """ > @@ -51,7 +47,7 @@ class TestUnitTestsEal(TestCase): > Run version autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("version_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -62,7 +58,7 @@ class TestUnitTestsEal(TestCase): > Run memcopy autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("memcpy_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -73,7 +69,7 @@ class TestUnitTestsEal(TestCase): > Run common autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("common_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -84,7 +80,7 @@ class TestUnitTestsEal(TestCase): > Run memcopy autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("eal_fs_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -95,7 +91,7 @@ class TestUnitTestsEal(TestCase): > Run memcopy autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("memcpy_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -105,7 +101,7 @@ class TestUnitTestsEal(TestCase): > """ > Run memcopy performance autotest. > """ > - self.dut.send_expect("%s ./app/test/test -n 1 -c ffff" % > self.dut.taskset(1), > + self.dut.send_expect(self.dut.taskset(1) + ' ' + > self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("memcpy_perf_autotest", "RTE>>", > self.run_cmd_time * 15) > self.dut.send_expect("quit", "# ") > @@ -116,7 +112,7 @@ class TestUnitTestsEal(TestCase): > Run hash autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("hash_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -126,7 +122,7 @@ class TestUnitTestsEal(TestCase): > Run has performance autotest. > """ >=20 > - self.dut.send_expect("%s ./app/test/test -n 1 -c fffe" % > self.dut.taskset(1), > + self.dut.send_expect(self.test_app_cmdline, > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("hash_perf_autotest", "RTE>>", > self.run_cmd_time * 10) > self.dut.send_expect("quit", "# ") > @@ -137,7 +133,7 @@ class TestUnitTestsEal(TestCase): > Run malloc autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("malloc_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -148,10 +144,10 @@ class TestUnitTestsEal(TestCase): > """ >=20 > if self.dut.architecture =3D=3D "x86_64": > - cmdline =3D "./app/test/test -n 1 -c ffff" > + cmdline =3D self.test_app_cmdline > else: > # mask cores only on socket 0 > - cmdline =3D "%s ./app/test/test -n 1 -c 5555" % > self.dut.taskset(1) > + cmdline =3D "%s ./%s/app/test -n 1 -c 5555" % > (self.dut.taskset(1), self.target) > self.dut.send_expect(cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("func_reentrancy_autotest", "RTE>>"= , > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > @@ -161,8 +157,8 @@ class TestUnitTestsEal(TestCase): > """ > Run pci autotest. > """ > - > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + # 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) > out =3D self.dut.send_expect("pci_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -172,7 +168,7 @@ class TestUnitTestsEal(TestCase): > Run atomic autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("atomic_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -182,7 +178,7 @@ class TestUnitTestsEal(TestCase): > Run memory autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect('memory_autotest', "RTE>>", > self.run_cmd_time * 5) > regexp =3D "phys:0x[0-9a-f]*, len:([0-9a-f]*), virt:0x[0-9a-f]*, > socket_id:[0-9]*" > match =3D utils.regexp(out, regexp) > @@ -195,7 +191,7 @@ class TestUnitTestsEal(TestCase): > Run lcore autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("per_lcore_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -205,7 +201,7 @@ class TestUnitTestsEal(TestCase): > Run spinlock autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("spinlock_autotest", "RTE>>", > self.run_cmd_time * 2) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -215,7 +211,7 @@ class TestUnitTestsEal(TestCase): > Run rwlock autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("rwlock_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -225,7 +221,7 @@ class TestUnitTestsEal(TestCase): > Run prefetch autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("prefetch_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -235,7 +231,7 @@ class TestUnitTestsEal(TestCase): > Run byte order autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("byteorder_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -245,7 +241,7 @@ class TestUnitTestsEal(TestCase): > Run cycles autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("cycles_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -255,7 +251,7 @@ class TestUnitTestsEal(TestCase): > Run logs autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("logs_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -265,7 +261,7 @@ class TestUnitTestsEal(TestCase): > Run memzone autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("memzone_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -275,7 +271,7 @@ class TestUnitTestsEal(TestCase): > Run debug autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("debug_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -285,7 +281,7 @@ class TestUnitTestsEal(TestCase): > Run eal flags autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff -m 64", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline + ' -m 64', > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("eal_flags_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -296,7 +292,7 @@ class TestUnitTestsEal(TestCase): > """ >=20 > self.verify(self.env =3D=3D "linuxapp", "Alarm only supported in > linux env") > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("alarm_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -306,7 +302,7 @@ class TestUnitTestsEal(TestCase): > Run CPU flags autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("cpuflags_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -316,7 +312,7 @@ class TestUnitTestsEal(TestCase): > Run errno autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*TE>>|RT.*E>>|RTE.*>>|RTE>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, > "R.*TE>>|RT.*E>>|RTE.*>>|RTE>.*>", self.start_test_time) > out =3D self.dut.send_expect("errno_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -327,7 +323,7 @@ class TestUnitTestsEal(TestCase): > """ >=20 > self.verify(self.env =3D=3D "linuxapp", "Interrupt only supporte= d in > linux env") > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*TE>>|RT.*E>>|RTE.*>>|RTE>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, > "R.*TE>>|RT.*E>>|RTE.*>>|RTE>.*>", self.start_test_time) > out =3D self.dut.send_expect("interrupt_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -337,7 +333,7 @@ class TestUnitTestsEal(TestCase): > Run multiprocess autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff -m 64", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline + ' -m 64', > "R.*T.*E.*>.*>", self.start_test_time) > out =3D self.dut.send_expect("multiprocess_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -347,7 +343,7 @@ class TestUnitTestsEal(TestCase): > Run string autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("string_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -357,7 +353,7 @@ class TestUnitTestsEal(TestCase): > Run tailq autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("tailq_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -367,7 +363,7 @@ class TestUnitTestsEal(TestCase): > Run devargs autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("devargs_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -377,7 +373,7 @@ class TestUnitTestsEal(TestCase): > Run kvargs autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("kvargs_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -387,7 +383,7 @@ class TestUnitTestsEal(TestCase): > Run acl autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("acl_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -397,7 +393,7 @@ class TestUnitTestsEal(TestCase): > Run acl autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("link_bonding_autotest", "RTE>>", > self.run_cmd_time) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -405,7 +401,7 @@ class TestUnitTestsEal(TestCase): > def test_link_bonding_rssconf(self): > """ > """ > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", self.start_test_time) > + self.dut.send_expect(self.test_app_cmdline, "R.*T.*E.*>.*>", > self.start_test_time) > out =3D self.dut.send_expect("link_bonding_rssconf_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_kni.py > b/tests/TestSuite_unit_tests_kni.py > index 20df8cc..ea8ef79 100644 > --- a/tests/TestSuite_unit_tests_kni.py > +++ b/tests/TestSuite_unit_tests_kni.py > @@ -72,8 +72,6 @@ class TestUnitTestsKni(TestCase): >=20 > KNI Prerequisites > """ > - out =3D self.dut.send_expect("make -C ./app/test/", "# ", 120) > - self.verify('make: Leaving directory' in out, "Compilation > failed") >=20 > self.insmod_kni() >=20 > @@ -87,7 +85,7 @@ class TestUnitTestsKni(TestCase): > """ > Run kni autotest. > """ > - self.dut.send_expect("./app/test/test -n 1 -c fffe", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c fffe" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("kni_autotest", "RTE>>", 60) > self.dut.send_expect("quit", "# ") >=20 > diff --git a/tests/TestSuite_unit_tests_lpm.py > b/tests/TestSuite_unit_tests_lpm.py > index d892916..4a26e03 100644 > --- a/tests/TestSuite_unit_tests_lpm.py > +++ b/tests/TestSuite_unit_tests_lpm.py > @@ -59,9 +59,7 @@ class TestUnitTestsLpmIpv6(TestCase): >=20 > Qos Prerequisites > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -72,7 +70,7 @@ class TestUnitTestsLpmIpv6(TestCase): > """ > Run lpm for IPv6 autotest. > """ > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("lpm_autotest", "RTE>>", 120) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -91,7 +89,7 @@ class TestUnitTestsLpmIpv6(TestCase): > hugepage_num =3D self.dut.get_total_huge_pages() > self.verify(hugepage_num >=3D 4096, "failed to request huge > memory") >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("lpm6_autotest", "RTE>>", 3600) > self.dut.send_expect("quit", "# ") > if env =3D=3D 'bsdapp': > diff --git a/tests/TestSuite_unit_tests_mbuf.py > b/tests/TestSuite_unit_tests_mbuf.py > index c4dfaab..df73e5d 100644 > --- a/tests/TestSuite_unit_tests_mbuf.py > +++ b/tests/TestSuite_unit_tests_mbuf.py > @@ -56,9 +56,7 @@ class TestUnitTestsMbuf(TestCase): > """ > Run at the start of each test suite. > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -70,7 +68,7 @@ class TestUnitTestsMbuf(TestCase): > Run mbuf autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D 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 0e4c211..70cf4f3 100644 > --- a/tests/TestSuite_unit_tests_mempool.py > +++ b/tests/TestSuite_unit_tests_mempool.py > @@ -56,9 +56,7 @@ class TestUnitTestsMempool(TestCase): > """ > Run at the start of each test suite. > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -70,7 +68,7 @@ class TestUnitTestsMempool(TestCase): > Run memory pool autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("mempool_autotest", "RTE>>", 120) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -79,7 +77,7 @@ class TestUnitTestsMempool(TestCase): > """ > Run memory pool performance autotest. > """ > - self.dut.send_expect("./app/test/test -n 1 -c fffe", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c fffe" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("mempool_perf_autotest", "RTE>>", 7= 00) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > diff --git a/tests/TestSuite_unit_tests_power.py > b/tests/TestSuite_unit_tests_power.py > index c4075a7..970e0a6 100644 > --- a/tests/TestSuite_unit_tests_power.py > +++ b/tests/TestSuite_unit_tests_power.py > @@ -57,9 +57,7 @@ class TestUnitTestsPower(TestCase): >=20 > Power Prerequisites > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -71,7 +69,7 @@ class TestUnitTestsPower(TestCase): > Run power autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("power_autotest", "RTE>>", 60) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -81,7 +79,7 @@ class TestUnitTestsPower(TestCase): > Run power acpi cpu frequency autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("power_acpi_cpufreq_autotest", "RTE= >>", > 60) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > diff --git a/tests/TestSuite_unit_tests_qos.py > b/tests/TestSuite_unit_tests_qos.py > index 5b8e023..1bc5f8d 100644 > --- a/tests/TestSuite_unit_tests_qos.py > +++ b/tests/TestSuite_unit_tests_qos.py > @@ -58,9 +58,7 @@ class TestUnitTestsQos(TestCase): >=20 > Qos Prerequisites > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -72,7 +70,7 @@ class TestUnitTestsQos(TestCase): > Run RED autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 30) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 30) > out =3D self.dut.send_expect("red_autotest", "RTE>>", 180) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -82,7 +80,7 @@ class TestUnitTestsQos(TestCase): > Run meter autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 30) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 30) > out =3D self.dut.send_expect("meter_autotest", "RTE>>", 5) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -95,7 +93,7 @@ class TestUnitTestsQos(TestCase): > [arch, machine, env, toolchain] =3D self.target.split('-') > self.verify(arch =3D=3D "x86_64", "Sched auto_test not support i= n > i686") >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 30) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 30) > out =3D 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 d542539..baa6610 100644 > --- a/tests/TestSuite_unit_tests_ring.py > +++ b/tests/TestSuite_unit_tests_ring.py > @@ -56,9 +56,7 @@ class TestUnitTestsRing(TestCase): > """ > Run at the start of each test suite. > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -70,7 +68,7 @@ class TestUnitTestsRing(TestCase): > Run ring autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D 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>>") > @@ -83,7 +81,7 @@ class TestUnitTestsRing(TestCase): > Run ring performance autotest. > """ >=20 > - self.dut.send_expect("./app/test/test -n 1 -c fffe", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c fffe" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D 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_timer.py > b/tests/TestSuite_unit_tests_timer.py > index 774de5d..2d5eb49 100644 > --- a/tests/TestSuite_unit_tests_timer.py > +++ b/tests/TestSuite_unit_tests_timer.py > @@ -56,9 +56,7 @@ class TestUnitTestsTimer(TestCase): > """ > Run at the start of each test suite. > """ > - out =3D self.dut.build_dpdk_apps('./app/test/') > - self.verify('make: Leaving directory' in out, "Compilation > failed") > - > + pass > def set_up(self): > """ > Run before each test case. > @@ -69,7 +67,7 @@ class TestUnitTestsTimer(TestCase): > """ > Run timer autotest. > """ > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("timer_autotest", "RTE>>", 60) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > @@ -78,7 +76,7 @@ class TestUnitTestsTimer(TestCase): > """ > Run timer autotest. > """ > - self.dut.send_expect("./app/test/test -n 1 -c ffff", > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, > "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("timer_perf_autotest", "RTE>>", 60) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") > -- > 1.9.3