summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-01-28 21:01:22 -0800
committer Cole Faust <colefaust@google.com> 2025-01-28 21:01:22 -0800
commit16d24013230a0048acf7e1e2a967e73d24fcd6d7 (patch)
treeb3a5e689c5bb6bc2aa65fbdf9fd53973a92c4320 /python
parentc159fddcbb8ff8b6a5e3171118394954c7d7cbbf (diff)
Remove py2 tests from runtest.sh
Python2 is being removed. Bug: 203436762 Test: Presubmits Change-Id: I5d73b61f5a3c8b7fc588725a78003da235c299b9
Diffstat (limited to 'python')
-rwxr-xr-xpython/tests/runtest.sh16
1 files changed, 1 insertions, 15 deletions
diff --git a/python/tests/runtest.sh b/python/tests/runtest.sh
index c44ec582a..916756165 100755
--- a/python/tests/runtest.sh
+++ b/python/tests/runtest.sh
@@ -25,15 +25,9 @@ fi
if [[ ( ! -f $ANDROID_HOST_OUT/nativetest64/par_test/par_test ) ||
( ! -f $ANDROID_HOST_OUT/bin/py3-cmd )]]; then
- echo "Run 'm par_test py2-cmd py3-cmd' first"
+ echo "Run 'm par_test py3-cmd' first"
exit 1
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
@@ -47,16 +41,8 @@ ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test/par_test --arg1 arg2
cd $(dirname ${BASH_SOURCE[0]})
-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
-if [ $(uname -s) = Linux ]; then
- 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
ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py --arg1 arg2