From 237d1318b288e6ddd8fdab02974b8bf9c97b495d Mon Sep 17 00:00:00 2001
From: sunway513 <peng.sun@amd.com>
Date: Mon, 24 Jul 2017 17:16:13 +0000
Subject: [PATCH] Fix indentation, binary path and add wait on popen calls to
 hipEnvVar test

[ROCm/clr commit: 046e9c570d8e10416dc1d0f8ce1d430d00fc8db9]
---
 .../clr/hipamd/tests/src/hipEnvVarDriver.cpp  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp b/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp
index 1edb158aa3..dc1d451e0d 100644
--- a/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp
+++ b/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp
@@ -28,16 +28,21 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include <assert.h>
 #include <string>
 #include "hip/hip_runtime.h"
+#include <chrono>
+#include <thread>
 using namespace std;
 
 int getDeviceNumber(){
-   FILE *in;
-   char buff[512];
-   string str;
-   if(!(in = popen("./hipEnvVar -c", "r"))){
-        return 1;
+    FILE *in;
+    char buff[512];
+    string str;
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    if(!(in = popen("./directed_tests/hipEnvVar -c", "r"))){
+         return 1;
+     }
+    while(fgets(buff, sizeof(buff), in)!=NULL){
+         cout << buff;
     }
-    fgets(buff, sizeof(buff), in);
     pclose(in);
     return atoi(buff);
 }
@@ -46,12 +51,15 @@ int getDeviceNumber(){
 int getDevicePCIBusNumRemote(int deviceID){
     FILE *in;
     char buff[512];
-    string str = "./hipEnvVar -d ";
+    string str = "./directed_tests/hipEnvVar -d ";
     str += std::to_string(deviceID);
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
     if(!(in = popen(str.c_str(), "r"))){
         return 1;
     }
-    fgets(buff, sizeof(buff), in);
+    while(fgets(buff, sizeof(buff), in)!=NULL){
+        cout << buff;
+    }
     pclose(in);
     return atoi(buff);
 }