Merge "ART: Use stdout in run-test 909"

1 files changed, 11 insertions, 7 deletions

diff --git a/test/909-attach-agent/attach.cc b/test/909-attach-agent/attach.cc
index 0150e0962f..3a6788a8e3 100644
--- a/test/909-attach-agent/attach.cc
+++ b/test/909-attach-agent/attach.cc
@@ -27,18 +27,22 @@
 namespace art {
 namespace Test909AttachAgent {
 
+static void Println(const char* c) {
+  fprintf(stdout, "%s\n", c);
+  fflush(stdout);
+}
+
 jint OnAttach(JavaVM* vm,
             char* options ATTRIBUTE_UNUSED,
             void* reserved ATTRIBUTE_UNUSED) {
-  fprintf(stderr, "Attached Agent for test 909-attach-agent\n");
-  fsync(1);
+  Println("Attached Agent for test 909-attach-agent");
   jvmtiEnv* env = nullptr;
   jvmtiEnv* env2 = nullptr;
 
 #define CHECK_CALL_SUCCESS(c) \
   do { \
     if ((c) != JNI_OK) { \
-      fprintf(stderr, "call " #c " did not succeed\n"); \
+      Println("call " #c " did not succeed"); \
       return -1; \
     } \
   } while (false)
@@ -46,7 +50,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) {
-    fprintf(stderr, "GetEnv returned same environment twice!\n");
+    Println("GetEnv returned same environment twice!");
     return -1;
   }
   unsigned char* local_data = nullptr;
@@ -56,19 +60,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) {
-    fprintf(stderr, "Got different data from local storage then what was set!\n");
+    Println("Got different data from local storage then what was set!");
     return -1;
   }
   CHECK_CALL_SUCCESS(env2->GetEnvironmentLocalStorage(reinterpret_cast<void**>(&get_data)));
   if (get_data != nullptr) {
-    fprintf(stderr, "env2 did not have nullptr local storage.\n");
+    Println("env2 did not have nullptr local storage.");
     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) {
-    fprintf(stderr, "Unexpected version number!\n");
+    Println("Unexpected version number!");
     return -1;
   }
   CHECK_CALL_SUCCESS(env->DisposeEnvironment());