1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-06-19 14:56:00 +01:00

uiauto/build_scripts: Update to use python3

Ensure we are invoking python3 when attempting to import `wa` and
update the printing syntax to be compatible.
This commit is contained in:
Marc Bonnici
2019-09-06 10:49:30 +01:00
committed by setrofim
parent 023cb88ab1
commit 75878e2f27
21 changed files with 21 additions and 21 deletions
wa
commands
templates
workloads
adobereader
uiauto
aitutu
uiauto
androbench
uiauto
antutu
uiauto
applaunch
uiauto
benchmarkpi
uiauto
chrome
uiauto
geekbench
uiauto
gfxbench
uiauto
glbenchmark
uiauto
gmail
uiauto
googlemaps
uiauto
googlephotos
uiauto
googleplaybooks
uiauto
googleslides
uiauto
motionmark
uiauto
pcmark
uiauto
speedometer
uiauto
vellamo
uiauto
youtube
uiauto

@ -16,7 +16,7 @@ fi
# Copy base class library from wlauto dist # Copy base class library from wlauto dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $$libs_dir mkdir -p $$libs_dir
cp $$base_class $$libs_dir cp $$base_class $$libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wlauto dist # Copy base class library from wlauto dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -34,7 +34,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -16,7 +16,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -16,7 +16,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wlauto dist # Copy base class library from wlauto dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -32,7 +32,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
mkdir -p $libs_dir mkdir -p $libs_dir
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
cp $base_class $libs_dir cp $base_class $libs_dir
# Build and return appropriate exit code if failed # Build and return appropriate exit code if failed

@ -31,7 +31,7 @@ fi
# Copy base classes from wa dist # Copy base classes from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir

@ -31,7 +31,7 @@ fi
# Copy base class library from wa dist # Copy base class library from wa dist
libs_dir=app/libs libs_dir=app/libs
base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"` base_class=`python3 -c "import os, wa; print(os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar'))"`
mkdir -p $libs_dir mkdir -p $libs_dir
cp $base_class $libs_dir cp $base_class $libs_dir