diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2019-10-04 09:32:52 +0200 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2019-10-11 13:47:02 -0700 |
| commit | a063aaea51c76951bc1dd5f9beabe9fc8a370232 (patch) | |
| tree | 906d0d12a0f95e99537069155e08f2e871dd674d /tests/Codegen/runTest.sh | |
| parent | 597703c51825862da444c05127a0dd369c8a5ff2 (diff) | |
codegen: do not modify caller's working directory
When changing directory to $ANDROID_BUILD_TOP, do so in a subshell
environment. This will leave the caller's working directory intact.
Test: manual (cd frameworks/base && source tests/Codegen/runTest.sh # afterwards, $(pwd) is still frameworks/base)
Change-Id: I6558f00a8912141f41c65426ba31c234fc9d63df
Diffstat (limited to 'tests/Codegen/runTest.sh')
| -rwxr-xr-x | tests/Codegen/runTest.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/Codegen/runTest.sh b/tests/Codegen/runTest.sh index 0e90deaadd61..929f122e261e 100755 --- a/tests/Codegen/runTest.sh +++ b/tests/Codegen/runTest.sh @@ -17,11 +17,13 @@ else header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java && \ header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java && \ header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java && \ - cd $ANDROID_BUILD_TOP && - header_and_eval mmma -j16 frameworks/base/tests/Codegen && \ - header_and_eval adb install -r -t "$(find $ANDROID_TARGET_OUT_TESTCASES -name 'CodegenTests.apk')" && \ - # header_and_eval adb shell am set-debug-app -w com.android.codegentest && \ - header_and_eval adb shell am instrument -w -e package com.android.codegentest com.android.codegentest/androidx.test.runner.AndroidJUnitRunner + ( + cd $ANDROID_BUILD_TOP && + header_and_eval mmma -j16 frameworks/base/tests/Codegen && \ + header_and_eval adb install -r -t "$(find $ANDROID_TARGET_OUT_TESTCASES -name 'CodegenTests.apk')" && \ + # header_and_eval adb shell am set-debug-app -w com.android.codegentest && \ + header_and_eval adb shell am instrument -w -e package com.android.codegentest com.android.codegentest/androidx.test.runner.AndroidJUnitRunner + ) exitCode=$? |