From a063aaea51c76951bc1dd5f9beabe9fc8a370232 Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Fri, 4 Oct 2019 09:32:52 +0200 Subject: 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 --- tests/Codegen/runTest.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests') 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=$? -- cgit v1.2.3-59-g8ed1b