diff options
| -rw-r--r-- | test/909-attach-agent/attach.cc | 12 | ||||
| -rwxr-xr-x | test/run-test | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/test/909-attach-agent/attach.cc b/test/909-attach-agent/attach.cc index 2b50eb83b4..adae844ef0 100644 --- a/test/909-attach-agent/attach.cc +++ b/test/909-attach-agent/attach.cc @@ -28,7 +28,7 @@ namespace Test909AttachAgent { jint OnAttach(JavaVM* vm, char* options ATTRIBUTE_UNUSED, void* reserved ATTRIBUTE_UNUSED) { - printf("Attached Agent for test 909-attach-agent\n"); + fprintf(stderr, "Attached Agent for test 909-attach-agent\n"); fsync(1); jvmtiEnv* env = nullptr; jvmtiEnv* env2 = nullptr; @@ -36,7 +36,7 @@ jint OnAttach(JavaVM* vm, #define CHECK_CALL_SUCCESS(c) \ do { \ if ((c) != JNI_OK) { \ - printf("call " #c " did not succeed\n"); \ + fprintf(stderr, "call " #c " did not succeed\n"); \ return -1; \ } \ } while (false) @@ -44,7 +44,7 @@ jint OnAttach(JavaVM* vm, CHECK_CALL_SUCCESS(vm->GetEnv(reinterpret_cast<void**>(&env), JVMTI_VERSION_1_0)); CHECK_CALL_SUCCESS(vm->GetEnv(reinterpret_cast<void**>(&env2), JVMTI_VERSION_1_0)); if (env == env2) { - printf("GetEnv returned same environment twice!\n"); + fprintf(stderr, "GetEnv returned same environment twice!\n"); return -1; } unsigned char* local_data = nullptr; @@ -54,19 +54,19 @@ jint OnAttach(JavaVM* vm, unsigned char* get_data = nullptr; CHECK_CALL_SUCCESS(env->GetEnvironmentLocalStorage(reinterpret_cast<void**>(&get_data))); if (get_data != local_data) { - printf("Got different data from local storage then what was set!\n"); + fprintf(stderr, "Got different data from local storage then what was set!\n"); return -1; } CHECK_CALL_SUCCESS(env2->GetEnvironmentLocalStorage(reinterpret_cast<void**>(&get_data))); if (get_data != nullptr) { - printf("env2 did not have nullptr local storage.\n"); + fprintf(stderr, "env2 did not have nullptr local storage.\n"); return -1; } CHECK_CALL_SUCCESS(env->Deallocate(local_data)); jint version = 0; CHECK_CALL_SUCCESS(env->GetVersionNumber(&version)); if ((version & JVMTI_VERSION_1) != JVMTI_VERSION_1) { - printf("Unexpected version number!\n"); + fprintf(stderr, "Unexpected version number!\n"); return -1; } CHECK_CALL_SUCCESS(env->DisposeEnvironment()); diff --git a/test/run-test b/test/run-test index d55ba771a2..c926c115e2 100755 --- a/test/run-test +++ b/test/run-test @@ -80,7 +80,7 @@ fi # ANDROID_HOST_OUT is not set in a build environment. if [ -z "$ANDROID_HOST_OUT" ]; then - export ANDROID_HOST_OUT=$ANDROID_BUILD_TOP/out/host/linux-x86 + export ANDROID_HOST_OUT=${OUT_DIR:-$ANDROID_BUILD_TOP/out/}host/linux-x86 fi # If JACK_CLASSPATH is not set, assume it only contains core-libart. diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 5a6114e3cc..3621800a82 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -823,10 +823,8 @@ def parse_option(): return test def main(): - global verbose gather_test_info() user_requested_test = parse_option() - verbose = True setup_test_env() if build: build_targets = '' |