diff options
| author | 2019-10-14 17:51:27 +0000 | |
|---|---|---|
| committer | 2019-10-14 17:51:27 +0000 | |
| commit | aa66ce5da7dfa4550fdb5e98c0d2d220aefe4bcc (patch) | |
| tree | 2365ab868059107cf5872719a099de12bd06c4f3 | |
| parent | f8b34236ef444364d0ad92391f6452cc2c3a56a1 (diff) | |
| parent | a063aaea51c76951bc1dd5f9beabe9fc8a370232 (diff) | |
Merge "codegen: do not modify caller's working directory"
| -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=$? |