Skip to content

Update packaging. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Update packaging. #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712754a
Update packaging.
dvalinrh Sep 18, 2023
5e51e61
Fix variable name
dvalinrh Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions pyperf/pyperf_run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
PATH="${PATH}:/usr/local/bin"
export PATH
python_pkgs=""
test_tools/detect_os | grep Ubuntu > /dev/null
ubuntu=$?
python_exec=""
#
# To make sure.
Expand Down Expand Up @@ -109,26 +107,9 @@ generate_csv_file()
printf "%s:%12.2f:%s\n" $test_name $results $unit >> ${1}.csv
}

pkg_install()
{
if [ to_no_pkg_install -eq 0 ]; then
if [ $ubuntu -eq 0 ]; then
apt install -y $1
if [ $? -ne 0 ]; then
exit_out "apt install of $1 failed" 1
fi
else
dnf install -y $1
if [ $? -ne 0 ]; then
exit_out "dnf install of $1 failed" 1
fi
fi
fi
}

pip3_install()
{
if [ to_no_pkg_install -eq 0 ]; then
if [ $to_no_pkg_install -eq 0 ]; then
pip3 install $1
if [ $? -ne 0 ]; then
exit_out "pip3 install of $1 failed." 1
Expand Down Expand Up @@ -270,10 +251,7 @@ if [ $to_pbench -eq 0 ]; then
fi
if [[ ${python_pkgs} != "" ]]; then
pkg_list=`echo $python_pkgs | sed "s/,/ /g"`
echo pkg_list $pkg_list >>/tmp/dave
for i in $pkg_list; do
pkg_install $i
done
test_tools/package_install --packages "$python_pkgs" --no_packages $to_no_pkg_install
fi
if [[ $python_exec != "" ]]; then
if [[ ! -f $python_exec ]]; then
Expand Down