File tree Expand file tree Collapse file tree 1 file changed +2
-24
lines changed Expand file tree Collapse file tree 1 file changed +2
-24
lines changed Original file line number Diff line number Diff line change 33PATH=" ${PATH} :/usr/local/bin"
44export PATH
55python_pkgs=" "
6- test_tools/detect_os | grep Ubuntu > /dev/null
7- ubuntu=$?
86python_exec=" "
97#
108# To make sure.
@@ -109,26 +107,9 @@ generate_csv_file()
109107 printf " %s:%12.2f:%s\n" $test_name $results $unit >> ${1} .csv
110108}
111109
112- pkg_install ()
113- {
114- if [ to_no_pkg_install -eq 0 ]; then
115- if [ $ubuntu -eq 0 ]; then
116- apt install -y $1
117- if [ $? -ne 0 ]; then
118- exit_out " apt install of $1 failed" 1
119- fi
120- else
121- dnf install -y $1
122- if [ $? -ne 0 ]; then
123- exit_out " dnf install of $1 failed" 1
124- fi
125- fi
126- fi
127- }
128-
129110pip3_install ()
130111{
131- if [ to_no_pkg_install -eq 0 ]; then
112+ if [ $ to_no_pkg_install -eq 0 ]; then
132113 pip3 install $1
133114 if [ $? -ne 0 ]; then
134115 exit_out " pip3 install of $1 failed." 1
@@ -270,10 +251,7 @@ if [ $to_pbench -eq 0 ]; then
270251 fi
271252 if [[ ${python_pkgs} != " " ]]; then
272253 pkg_list=` echo $python_pkgs | sed " s/,/ /g" `
273- echo pkg_list $pkg_list >> /tmp/dave
274- for i in $pkg_list ; do
275- pkg_install $i
276- done
254+ test_tools/package_install --packages " python_pkgs" --no_packages $to_no_pkg_install
277255 fi
278256 if [[ $python_exec != " " ]]; then
279257 if [[ ! -f $python_exec ]]; then
You can’t perform that action at this time.
0 commit comments