From 67d42587862acffd1fbb59e195790bef8bcd7f0e Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 3 Dec 2019 23:54:04 -0800 Subject: [PATCH] Test par file argument handling This had been broken with my python3 launcher. Test: build/soong/python/tests/runtest.sh Change-Id: I0524e5a80244bf1080cb28237b23ef0d023e03dc --- python/tests/par_test.py | 7 +++++++ python/tests/runtest.sh | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/python/tests/par_test.py b/python/tests/par_test.py index 1fafe0f82..56a5063c4 100644 --- a/python/tests/par_test.py +++ b/python/tests/par_test.py @@ -44,6 +44,13 @@ assert_equal("sys.path[0]", sys.path[0], archive) assert_equal("sys.path[1]", sys.path[1], os.path.join(archive, "internal")) assert_equal("sys.path[2]", sys.path[2], os.path.join(archive, "internal", "stdlib")) +if os.getenv('ARGTEST', False): + assert_equal("len(sys.argv)", len(sys.argv), 3) + assert_equal("sys.argv[1]", sys.argv[1], "--arg1") + assert_equal("sys.argv[2]", sys.argv[2], "arg2") +else: + assert_equal("len(sys.argv)", len(sys.argv), 1) + if failed: sys.exit(1) diff --git a/python/tests/runtest.sh b/python/tests/runtest.sh index 1ecdebc9e..21187ed38 100755 --- a/python/tests/runtest.sh +++ b/python/tests/runtest.sh @@ -36,8 +36,12 @@ PYTHONHOME= PYTHONPATH= $ANDROID_HOST_OUT/nativetest64/par_test/par_test PYTHONHOME=/usr $ANDROID_HOST_OUT/nativetest64/par_test/par_test PYTHONPATH=/usr $ANDROID_HOST_OUT/nativetest64/par_test/par_test +ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test/par_test --arg1 arg2 + PYTHONHOME= PYTHONPATH= $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 PYTHONHOME=/usr $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 PYTHONPATH=/usr $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 +ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 --arg1 arg2 + echo "Passed!"