summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-28 22:50:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commite47e2669161a802ef95aa65bcd7ccb2a5bcf921c (patch)
treee4e08245d978b781c9bdc1e1f8b424afa119d2b7 /meta/recipes-extended
parentb4932a18ab76c8b671f22ca8ad528049f0dd30b4 (diff)
downloadpoky-e47e2669161a802ef95aa65bcd7ccb2a5bcf921c.tar.gz
ltp: move from python 2.x to python 3.x
(From OE-Core rev: e3c32de13e37b674ee8efb585337d57de8c555fd) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch161
-rw-r--r--meta/recipes-extended/ltp/ltp_20190517.bb3
2 files changed, 163 insertions, 1 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
new file mode 100644
index 0000000000..f4f87f38ab
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
@@ -0,0 +1,161 @@
1From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Aug 2019 18:30:23 +0200
4Subject: [PATCH] testcases: use python3 everywhere to run python scripts
5
6The scripts themselves have #!/usr/bin/python3 in them,
7so I trust they are already py3-compatible.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 testcases/kernel/power_management/runpwtests05.sh | 2 +-
13 .../power_management/runpwtests_exclusive01.sh | 2 +-
14 .../power_management/runpwtests_exclusive02.sh | 2 +-
15 .../power_management/runpwtests_exclusive03.sh | 2 +-
16 .../power_management/runpwtests_exclusive04.sh | 2 +-
17 .../power_management/runpwtests_exclusive05.sh | 2 +-
18 testcases/network/nfsv4/acl/runtest | 14 +++++++-------
19 testcases/realtime/func/pi-tests/run_auto.sh | 6 +++---
20 8 files changed, 16 insertions(+), 16 deletions(-)
21
22diff --git a/testcases/kernel/power_management/runpwtests05.sh b/testcases/kernel/power_management/runpwtests05.sh
23index 8a7d0f6e0..43e234d01 100755
24--- a/testcases/kernel/power_management/runpwtests05.sh
25+++ b/testcases/kernel/power_management/runpwtests05.sh
26@@ -35,7 +35,7 @@ else
27 max_sched_smt=1
28 fi
29
30-tst_test_cmds python
31+tst_test_cmds python3
32
33 if ! grep sched_debug -qw /proc/cmdline ; then
34 tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \
35diff --git a/testcases/kernel/power_management/runpwtests_exclusive01.sh b/testcases/kernel/power_management/runpwtests_exclusive01.sh
36index ec78319e2..9fefcbf6e 100755
37--- a/testcases/kernel/power_management/runpwtests_exclusive01.sh
38+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh
39@@ -35,7 +35,7 @@ else
40 max_sched_smt=1
41 fi
42
43-tst_test_cmds python
44+tst_test_cmds python3
45
46 hyper_threaded=$(is_hyper_threaded)
47 multi_socket=$(is_multi_socket)
48diff --git a/testcases/kernel/power_management/runpwtests_exclusive02.sh b/testcases/kernel/power_management/runpwtests_exclusive02.sh
49index e107fce35..2cd0ecb05 100755
50--- a/testcases/kernel/power_management/runpwtests_exclusive02.sh
51+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh
52@@ -33,7 +33,7 @@ else
53 max_sched_smt=1
54 fi
55
56-tst_test_cmds python
57+tst_test_cmds python3
58
59 hyper_threaded=$(is_hyper_threaded)
60 multi_socket=$(is_multi_socket)
61diff --git a/testcases/kernel/power_management/runpwtests_exclusive03.sh b/testcases/kernel/power_management/runpwtests_exclusive03.sh
62index 490344bb3..ab3a5d11d 100755
63--- a/testcases/kernel/power_management/runpwtests_exclusive03.sh
64+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh
65@@ -35,7 +35,7 @@ else
66 max_sched_smt=1
67 fi
68
69-tst_test_cmds python
70+tst_test_cmds python3
71
72 hyper_threaded=$(is_hyper_threaded)
73 multi_socket=$(is_multi_socket)
74diff --git a/testcases/kernel/power_management/runpwtests_exclusive04.sh b/testcases/kernel/power_management/runpwtests_exclusive04.sh
75index 978ca02ae..438ef603f 100755
76--- a/testcases/kernel/power_management/runpwtests_exclusive04.sh
77+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh
78@@ -27,7 +27,7 @@ export TST_TOTAL=2
79 # Checking test environment
80 check_kervel_arch
81
82-tst_test_cmds python
83+tst_test_cmds python3
84
85 hyper_threaded=$(is_hyper_threaded)
86 multi_socket=$(is_multi_socket)
87diff --git a/testcases/kernel/power_management/runpwtests_exclusive05.sh b/testcases/kernel/power_management/runpwtests_exclusive05.sh
88index a0dad5834..3a9afdbf2 100755
89--- a/testcases/kernel/power_management/runpwtests_exclusive05.sh
90+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh
91@@ -35,7 +35,7 @@ else
92 max_sched_smt=1
93 fi
94
95-tst_test_cmds python
96+tst_test_cmds python3
97
98 hyper_threaded=$(is_hyper_threaded)
99 multi_socket=$(is_multi_socket)
100diff --git a/testcases/network/nfsv4/acl/runtest b/testcases/network/nfsv4/acl/runtest
101index d2e1b4c49..a859e85bc 100755
102--- a/testcases/network/nfsv4/acl/runtest
103+++ b/testcases/network/nfsv4/acl/runtest
104@@ -22,7 +22,7 @@ do
105 done
106
107 # creation of users on the remote machine (removed only at the end of the tests)
108-rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50
109+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50
110
111 echo "Starting ACL testing"
112
113@@ -51,19 +51,19 @@ echo "Basic tests finished"
114
115 echo "LONG ACL TEST"
116 echo "creating necessary users and groups"
117-python create_users.py -u 50 -g 50
118+python3 create_users.py -u 50 -g 50
119 echo "creating necessary users and groups on the remote host"
120 mkdir $NFSMNTDIR/lacl-testdir
121-python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir
122+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir
123 rm -rf $NFSMNTDIR/lacl-testdir
124 echo "Long ACL test OK with $MAXLENGTH entries"
125 echo "ACL STRESSING TEST"
126-python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR
127+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR
128
129 # remove local an remote users
130-python cleanusers.py
131-python cleangroups.py
132-rsh -n $REMOTEHOST python $PWD/cleanusers.py
133+python3 cleanusers.py
134+python3 cleangroups.py
135+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py
136
137 echo "Test OK"
138
139diff --git a/testcases/realtime/func/pi-tests/run_auto.sh b/testcases/realtime/func/pi-tests/run_auto.sh
140index d13026049..277988568 100755
141--- a/testcases/realtime/func/pi-tests/run_auto.sh
142+++ b/testcases/realtime/func/pi-tests/run_auto.sh
143@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0
144
145 export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log"
146 $SCRIPTS_DIR/run_c_files.sh $profile testpi-1
147-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
148+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
149
150 export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log"
151 $SCRIPTS_DIR/run_c_files.sh $profile testpi-2
152-PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
153+PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
154
155 export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log"
156 $SCRIPTS_DIR/run_c_files.sh $profile testpi-4
157-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
158+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
159
160
161 export LOG_FILE=""
diff --git a/meta/recipes-extended/ltp/ltp_20190517.bb b/meta/recipes-extended/ltp/ltp_20190517.bb
index 76c45f0103..69d75d5bb8 100644
--- a/meta/recipes-extended/ltp/ltp_20190517.bb
+++ b/meta/recipes-extended/ltp/ltp_20190517.bb
@@ -46,6 +46,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
46 file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \ 46 file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
47 file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \ 47 file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
48 file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \ 48 file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \
49 file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
49 " 50 "
50 51
51S = "${WORKDIR}/git" 52S = "${WORKDIR}/git"
@@ -97,7 +98,7 @@ RDEPENDS_${PN} = "\
97 libaio \ 98 libaio \
98 logrotate \ 99 logrotate \
99 perl \ 100 perl \
100 python-core \ 101 python3-core \
101 procps \ 102 procps \
102 quota \ 103 quota \
103 unzip \ 104 unzip \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 23:50:02 +0000