tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix running tests/benchmarks on the host."

Browse source 
am: dfa3231fae

Change-Id: I9f663c0f53cec6ffbb6327d6a0c0b8aebea68ebc
This commit is contained in:
Elliott Hughes 2019-04-27 09:30:13 -07:00 committed by android-build-merger
commit 766c77f88e
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmarks/run-on-host.sh
View file

@ -25,7 +25,7 @@ if [ ${HOST_OS}-${HOST_ARCH} = linux-x86 -o ${HOST_OS}-${HOST_ARCH} = linux-x86_
cd ${ANDROID_BUILD_TOP} cd ${ANDROID_BUILD_TOP}
export ANDROID_DATA=${TARGET_OUT_DATA} export ANDROID_DATA=${TARGET_OUT_DATA}
export ANDROID_ROOT=${TARGET_OUT} export ANDROID_ROOT=${TARGET_OUT}
${NATIVETEST}/bionic-benchmarks/bionic-benchmarks $@ ${BENCHMARKS}/bionic-benchmarks/bionic-benchmarks $@
) )
else else
echo "$0 not supported on TARGET_ARCH=$TARGET_ARCH" echo "$0 not supported on TARGET_ARCH=$TARGET_ARCH"

27
build/run-on-host.sh
View file

@ -15,33 +15,36 @@ function prepare()
BITS=$1 BITS=$1
shift shift
BENCHMARKS=${TARGET_OUT_DATA}/benchmarktest
NATIVETEST=${TARGET_OUT_DATA}/nativetest NATIVETEST=${TARGET_OUT_DATA}/nativetest
if [ "${BITS}" = 64 ]; then if [ "${BITS}" = 64 ]; then
BENCHMARKS=${BENCHMARKS}64
NATIVETEST=${NATIVETEST}64 NATIVETEST=${NATIVETEST}64
fi fi
if [ ${TARGET_ARCH} = arm -o ${TARGET_ARCH} = mips -o ${TARGET_ARCH} = x86 ]; then
LINKER=${TARGET_OUT_EXECUTABLES}/linker
else
LINKER="${TARGET_OUT_EXECUTABLES}/linker64 ${TARGET_OUT_EXECUTABLES}/linker"
fi
if [ ${TARGET_ARCH} = x86 -o ${TARGET_ARCH} = x86_64 ]; then if [ ${TARGET_ARCH} = x86 -o ${TARGET_ARCH} = x86_64 ]; then
m -j ${LINKER} ${TARGET_OUT}/etc/hosts ${TARGET_OUT_EXECUTABLES}/sh $@ m -j MODULES-IN-bionic MODULES-IN-external-icu MODULES-IN-external-mksh ${TARGET_OUT}/etc/hosts $@
if [ ! -d /system ]; then if [ ! -d /system ]; then
echo "Attempting to create /system"; echo "Attempting to create /system";
sudo mkdir -p -m 0777 /system; sudo mkdir -p -m 0777 /system;
mkdir -p -m 0777 /system/bin;
mkdir -p -m 0777 /system/lib;
mkdir -p -m 0777 /system/lib64;
fi fi
( (
cd ${ANDROID_BUILD_TOP} cd ${ANDROID_BUILD_TOP}
mkdir -p ${TARGET_OUT_DATA}/local/tmp mkdir -p ${TARGET_OUT_DATA}/local/tmp
ln -fs `realpath ${TARGET_OUT}/bin` /system/ for i in ${TARGET_OUT}/bin/bootstrap/* ${TARGET_OUT}/bin/*; do
ln -fs `realpath ${i}` /system/bin/
done
ln -fs `realpath ${TARGET_OUT}/etc` /system/ ln -fs `realpath ${TARGET_OUT}/etc` /system/
ln -fs `realpath ${TARGET_OUT}/lib` /system/ for i in ${TARGET_OUT}/lib/bootstrap/* ${TARGET_OUT}/lib/*; do
if [ -d "${TARGET_OUT}/lib64" ]; then ln -fs `realpath ${i}` /system/lib/
ln -fs `realpath ${TARGET_OUT}/lib64` /system/; done
fi for i in ${TARGET_OUT}/lib64/bootstrap/* ${TARGET_OUT}/lib64/*; do
ln -fs `realpath ${i}` /system/lib64/
done
) )
fi fi
} }

1
tests/run-on-host.sh
View file

@ -20,6 +20,7 @@ fi
if [ ${HOST_OS}-${HOST_ARCH} = linux-x86 -o ${HOST_OS}-${HOST_ARCH} = linux-x86_64 ]; then if [ ${HOST_OS}-${HOST_ARCH} = linux-x86 -o ${HOST_OS}-${HOST_ARCH} = linux-x86_64 ]; then
prepare $1 bionic-unit-tests prepare $1 bionic-unit-tests
shift
if [ ${TARGET_ARCH} = x86 -o ${TARGET_ARCH} = x86_64 ]; then if [ ${TARGET_ARCH} = x86 -o ${TARGET_ARCH} = x86_64 ]; then
( (