From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 03FE1A053A;
Tue, 4 Aug 2020 16:09:13 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 6A2FA1C0BE;
Tue, 4 Aug 2020 16:08:09 +0200 (CEST)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by dpdk.org (Postfix) with ESMTP id C80081C0AE
for <dev@dpdk.org>; Tue, 4 Aug 2020 16:08:06 +0200 (CEST)
IronPort-SDR: IzDn/LbglLo3dE7q5mSY4eVWo6jCkte7KjwAPYS/qE2oqymey0+129xF+S9BmkbfV76cXLjJEg
uUPr+m+N6gPQ==
X-IronPort-AV: E=McAfee;i="6000,8403,9702"; a="237173551"
X-IronPort-AV: E=Sophos;i="5.75,434,1589266800"; d="scan'208";a="237173551"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga006.jf.intel.com ([10.7.209.51])
by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
04 Aug 2020 07:08:06 -0700
IronPort-SDR: uZSyFk0f1Xo32vnItKBVhNH/yMRqF9vek8Z6sxqOQCH5ANJKr1bsxy/lQyG6DHCi8UpdGxTf4k
uxINvhProW+Q==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.75,434,1589266800"; d="scan'208";a="292578204"
Received: from silpixa00389033.ir.intel.com (HELO
silpixa00389033.ger.corp.intel.com) ([10.237.223.171])
by orsmga006.jf.intel.com with ESMTP; 04 Aug 2020 07:08:04 -0700
From: Louise Kilheeney <louise.kilheeney@intel.com>
To: dev@dpdk.org
Cc: anatoly.burakov@intel.com, bruce.richardson@intel.com,
robin.jarry@6wind.com, Louise Kilheeney <louise.kilheeney@intel.com>,
Olivier Matz <olivier.matz@6wind.com>
Date: Tue, 4 Aug 2020 15:07:34 +0100
Message-Id: <20200804140738.35317-6-louise.kilheeney@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200804140738.35317-1-louise.kilheeney@intel.com>
References: <20200522132320.26373-1-louise.kilheeney@intel.com>
<20200804140738.35317-1-louise.kilheeney@intel.com>
Subject: [dpdk-dev] [PATCH v4 5/9] app/test-cmdline: support python3 only
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Changed script to explicitly use python3 only to avoid
maintaining python 2 and removed deprecation notice.
Cc: Olivier Matz <olivier.matz@6wind.com>
Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
---
app/test-cmdline/cmdline_test.py | 7 +------
app/test-cmdline/cmdline_test_data.py | 1 +
mk/rte.sdktest.mk | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py
index 954428e2bf..ec55647f6e 100755
--- a/app/test-cmdline/cmdline_test.py
+++ b/app/test-cmdline/cmdline_test.py
@@ -1,9 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
# Script that runs cmdline_test app and feeds keystrokes into it.
-from __future__ import print_function
import cmdline_test_data
import os
import pexpect
@@ -19,10 +18,6 @@ def runTest(child, test):
return 0
child.expect(test["Result"], 1)
-if sys.version_info.major < 3:
- print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr)
- print("Please use Python 3 instead", file=sys.stderr)
-
#
# history test is a special case
#
diff --git a/app/test-cmdline/cmdline_test_data.py b/app/test-cmdline/cmdline_test_data.py
index 114d2cb6a0..2d9b3262a6 100644
--- a/app/test-cmdline/cmdline_test_data.py
+++ b/app/test-cmdline/cmdline_test_data.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index 803018ba3a..ad7ef138f0 100644
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -63,7 +63,7 @@ coverage:
@mkdir -p $(AUTOTEST_DIR) ; \
cd $(AUTOTEST_DIR) ; \
if [ -f $(RTE_OUTPUT)/app/test ]; then \
- python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
+ python3 $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
$(RTE_OUTPUT)/app/cmdline_test; \
ulimit -S -n 100 ; \
python $(RTE_SDK)/app/test/autotest.py \
--
2.17.1