From 31157573ca823393027168eb82986a7c5555ca2d Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Thu, 26 Apr 2018 10:25:34 +0200
Subject: [PATCH] Fix ult execution: change dir after getting run path

Change-Id: If2b9d07809004bfb4edbc4b4c50762226a98d2e9
---
 unit_tests/main.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index 3447bcc17e..58ebb99e55 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -271,18 +271,6 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-#ifdef WIN32
-#include <direct.h>
-    if (_chdir(hardwarePrefix[productFamily])) {
-        std::cout << "chdir into " << hardwarePrefix[productFamily] << " directory failed.\nThis might cause test failures." << std::endl;
-    }
-#elif defined(__linux__)
-#include <unistd.h>
-    if (chdir(hardwarePrefix[productFamily]) != 0) {
-        std::cout << "chdir into " << hardwarePrefix[productFamily] << " directory failed.\nThis might cause test failures." << std::endl;
-    }
-#endif
-
     uint32_t threadsPerEu = 7;
     PLATFORM platform;
     auto hardwareInfo = hardwareInfoTable[productFamily];
@@ -333,6 +321,18 @@ int main(int argc, char **argv) {
     nClFiles.append(clFiles);
     clFiles = nClFiles;
 
+#ifdef WIN32
+#include <direct.h>
+    if (_chdir(hardwarePrefix[productFamily])) {
+        std::cout << "chdir into " << hardwarePrefix[productFamily] << " directory failed.\nThis might cause test failures." << std::endl;
+    }
+#elif defined(__linux__)
+#include <unistd.h>
+    if (chdir(hardwarePrefix[productFamily]) != 0) {
+        std::cout << "chdir into " << hardwarePrefix[productFamily] << " directory failed.\nThis might cause test failures." << std::endl;
+    }
+#endif
+
     auto pDevices = new const HardwareInfo *[numDevices];
     for (decltype(numDevices) i = 0; i < numDevices; ++i) {
         pDevices[i] = &device;