From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id ED34E2BF2 for ; Wed, 6 Mar 2019 04:00:09 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Mar 2019 19:00:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,446,1544515200"; d="scan'208";a="148974804" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.176.135]) by fmsmga002.fm.intel.com with ESMTP; 05 Mar 2019 19:00:03 -0800 From: Wenjie Li To: dts@dpdk.org Cc: Wenjie Li Date: Wed, 6 Mar 2019 11:04:02 +0800 Message-Id: <1551841442-21029-1-git-send-email-wenjiex.a.li@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V2] framwork/project_dpdk: remove build_install_dpdk_test_app 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: Wed, 06 Mar 2019 03:00:10 -0000 DPDK moved dpdk/test to dpdk/app/test, it is unnecessary to build dpdk/test anymore. Signed-off-by: Wenjie Li --- framework/project_dpdk.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index 2ad01e8..6035c68 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -217,15 +217,10 @@ class DPDKdut(Dut): # compile out = self.send_expect("make -j %d install T=%s %s" % (self.number_of_cores, target, extra_options), "# ", build_time) - #should not check test app compile status, because if test compile fail, - #all unit test can't exec, but others case will exec successfully - self.build_install_dpdk_test_app(target, build_time) - if("Error" in out or "No rule to make" in out): self.logger.error("ERROR - try without '-j'") # if Error try to execute make without -j option out = self.send_expect("make install T=%s %s" % (target, extra_options), "# ", 120) - self.build_install_dpdk_test_app(target, build_time) assert ("Error" not in out), "Compilation error..." assert ("No rule to make" not in out), "No rule to make error..." @@ -244,30 +239,15 @@ class DPDKdut(Dut): out = self.send_expect("make -j %d install T=%s CC=gcc48" % (self.number_of_cores, target), "#", build_time) - #should not check test app compile status, because if test compile fail, - #all unit test can't exec, but others case will exec sucessfull - self.build_install_dpdk_test_app(target, build_time, os_type="freebsd") - if("Error" in out or "No rule to make" in out): self.logger.error("ERROR - try without '-j'") # if Error try to execute make without -j option out = self.send_expect("make install T=%s CC=gcc48" % target, "#", build_time) - self.build_install_dpdk_test_app(target, build_time, os_type="freebsd") assert ("Error" not in out), "Compilation error..." assert ("No rule to make" not in out), "No rule to make error..." - def build_install_dpdk_test_app(self, target, build_time, os_type="linux"): - cmd_build_test = "make -j %d -C test/" % (self.number_of_cores) - if os_type == "freebsd": - cmd_build_test = "make -j %d -C test/ CC=gcc48" % (self.number_of_cores) - - self.send_expect(cmd_build_test, "# ", build_time) - app_list = ['./test/test/test', './test/test-acl/testacl', './test/test-pipeline/testpipeline', './test/cmdline_test/cmdline_test'] - for app in app_list: - self.send_expect('cp -f %s ./%s/app' % (app, target), "# ", 30) - def prepare_package(self): if not self.skip_setup: assert (os.path.isfile(self.package) is True), "Invalid package" -- 2.17.2