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 3
3
PATH=" ${PATH} :/usr/local/bin"
4
4
export PATH
5
5
python_pkgs=" "
6
- test_tools/detect_os | grep Ubuntu > /dev/null
7
- ubuntu=$?
8
6
python_exec=" "
9
7
#
10
8
# To make sure.
@@ -109,26 +107,9 @@ generate_csv_file()
109
107
printf " %s:%12.2f:%s\n" $test_name $results $unit >> ${1} .csv
110
108
}
111
109
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
-
129
110
pip3_install ()
130
111
{
131
- if [ to_no_pkg_install -eq 0 ]; then
112
+ if [ $ to_no_pkg_install -eq 0 ]; then
132
113
pip3 install $1
133
114
if [ $? -ne 0 ]; then
134
115
exit_out " pip3 install of $1 failed." 1
@@ -270,10 +251,7 @@ if [ $to_pbench -eq 0 ]; then
270
251
fi
271
252
if [[ ${python_pkgs} != " " ]]; then
272
253
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
277
255
fi
278
256
if [[ $python_exec != " " ]]; then
279
257
if [[ ! -f $python_exec ]]; then
You can’t perform that action at this time.
0 commit comments