Merge "Skip py2-cmd tests on Mac" into main
This commit is contained in:
@@ -24,11 +24,16 @@ if [ -z $ANDROID_HOST_OUT ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ( ! -f $ANDROID_HOST_OUT/nativetest64/par_test/par_test ) ||
|
if [[ ( ! -f $ANDROID_HOST_OUT/nativetest64/par_test/par_test ) ||
|
||||||
( ! -f $ANDROID_HOST_OUT/bin/py2-cmd ) ||
|
|
||||||
( ! -f $ANDROID_HOST_OUT/bin/py3-cmd )]]; then
|
( ! -f $ANDROID_HOST_OUT/bin/py3-cmd )]]; then
|
||||||
echo "Run 'm par_test py2-cmd py3-cmd' first"
|
echo "Run 'm par_test py2-cmd py3-cmd' first"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if [ $(uname -s) = Linux ]; then
|
||||||
|
if [[ ! -f $ANDROID_HOST_OUT/bin/py2-cmd ]]; then
|
||||||
|
echo "Run 'm par_test py2-cmd py3-cmd' first"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib64
|
export LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib64
|
||||||
|
|
||||||
@@ -42,11 +47,15 @@ ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test/par_test --arg1 arg2
|
|||||||
|
|
||||||
cd $(dirname ${BASH_SOURCE[0]})
|
cd $(dirname ${BASH_SOURCE[0]})
|
||||||
|
|
||||||
PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py
|
if [ $(uname -s) = Linux ]; then
|
||||||
|
PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py
|
||||||
|
fi
|
||||||
PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py
|
PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py
|
||||||
|
|
||||||
ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py arg1 arg2
|
if [ $(uname -s) = Linux ]; then
|
||||||
ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py --arg1 arg2
|
ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py arg1 arg2
|
||||||
|
ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py --arg1 arg2
|
||||||
|
fi
|
||||||
|
|
||||||
ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py arg1 arg2
|
ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py arg1 arg2
|
||||||
ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py --arg1 arg2
|
ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py --arg1 arg2
|
||||||
|
Reference in New Issue
Block a user