From 0d410147cfb9f56df1c443ea20874554328b5ab8 Mon Sep 17 00:00:00 2001
From: Saleel Kudchadker <Saleel.Kudchadker@amd.com>
Date: Fri, 17 Aug 2018 12:14:42 -0700
Subject: [PATCH] Check for hipEnvVar at the same level if directed_tests
 location fails

[ROCm/hip commit: 8e0e373f69b33dd1d9f4b0ef8e4bf974d3e08188]
---
 projects/hip/tests/src/hipEnvVarDriver.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/projects/hip/tests/src/hipEnvVarDriver.cpp b/projects/hip/tests/src/hipEnvVarDriver.cpp
index 599b138565..e52aa46063 100644
--- a/projects/hip/tests/src/hipEnvVarDriver.cpp
+++ b/projects/hip/tests/src/hipEnvVarDriver.cpp
@@ -38,7 +38,10 @@ int getDeviceNumber() {
     string str;
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
     if (!(in = popen("./directed_tests/hipEnvVar -c", "r"))) {
-        return 1;
+        // Check at same level
+        if (!(in = popen("./hipEnvVar -c", "r"))) {
+            return 1;
+        }
     }
     while (fgets(buff, 512, in) != NULL) {
         cout << buff;
@@ -54,7 +57,11 @@ void getDevicePCIBusNumRemote(int deviceID, char* pciBusID) {
     str += std::to_string(deviceID);
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
     if (!(in = popen(str.c_str(), "r"))) {
-        exit(1);
+        // Check at same level
+        if (!(in = popen("./hipEnvVar -d ", "r"))) {
+            exit(1);
+        }
+
     }
     while (fgets(pciBusID, 100, in) != NULL) {
         cout << pciBusID;