From 087af58630620f7b3086bdb9ba39ff820feee4e7 Mon Sep 17 00:00:00 2001 From: Philip Li Date: Sun, 17 Sep 2023 09:30:50 +0800 Subject: [PATCH] programs/will-it-scale: use native python3 This reverts ddd4c73b525a ("tests/will-it-scale: use python3.8 to run will-it-scale") This simplies the build of will-it-scale and resolves issue reported on fedora 38 [0]. The downside is it causes that will-it-scale can't run on distro which doesn't have native package for pyhon3.8 and above. Link: https://github.com/intel/lkp-tests/issues/316 [0] Signed-off-by: Philip Li --- programs/will-it-scale/pkg/PKGBUILD | 14 ++------------ programs/will-it-scale/run | 5 ++++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/will-it-scale/pkg/PKGBUILD b/programs/will-it-scale/pkg/PKGBUILD index 8c1da540f..3f0f56c75 100644 --- a/programs/will-it-scale/pkg/PKGBUILD +++ b/programs/will-it-scale/pkg/PKGBUILD @@ -4,21 +4,11 @@ pkgrel=1 url='https://github.com/antonblanchard/will-it-scale.git' arch=('i386' 'x86_64' 'aarch64') license=('GPL') -source=('https://github.com/antonblanchard/will-it-scale.git' - https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tar.xz) -md5sums=('SKIP' 'SKIP') - -build_python3() -{ - cd $srcdir/Python-3.8.3 - ./configure --prefix=${pkgdir}/lkp/benchmarks/python3 - make - make install -} +source=('https://github.com/antonblanchard/will-it-scale.git') +md5sums=('SKIP') build() { - build_python3 cd $srcdir/${pkgname} make } diff --git a/programs/will-it-scale/run b/programs/will-it-scale/run index 95f2bf3c6..ea5f3f8f3 100755 --- a/programs/will-it-scale/run +++ b/programs/will-it-scale/run @@ -6,6 +6,8 @@ # - no_affinity # - smt +. $LKP_SRC/lib/debug.sh + ## It Scale takes a testcase and runs it from 1 through to n ## parallel copies to see if the testcase will scale. It ## builds both a process and threads based test in order @@ -44,4 +46,5 @@ fi ulimit -n 65536 -log_cmd /lkp/benchmarks/python3/bin/python3 ./runtest.py $test $duration $mode $no_affinity $smt $threads_to_iterate +has_cmd python3 || die "python3 is not found in $PATH" +log_cmd python3 ./runtest.py $test $duration $mode $no_affinity $smt $threads_to_iterate