[dtests] refactor windows specific changes (#1313)

* [dtests] refactor windows specific changes

* Refactor hipMemoryAllocateCoherentDriver - PR- 1309

* Fix missing z in _putenv_s

* Revert "Fix missing z in _putenv_s"

This reverts commit 099a1b20a5c75c5f122d57c0ad2bca01745cdc9c.

* Refactor changes from PR 1299

* Update hipEnvVarDriver.cpp


[ROCm/clr commit: c741ad3c80]

projects/clr/hipamd/tests/src/hipEnvVar.cpp

@@ -31,14 +31,7 @@ THE SOFTWARE.
 #include "clara/clara.hpp"
 #include <string>
 #include "hip/hip_runtime.h"
-
-#ifdef _WIN64
-#include <tchar.h>
-#endif
-
-#ifdef _WIN64
-#define setenv(x,y,z) _putenv_s(x,y)
-#endif
+#include "test_common.h"
 
 using namespace std;
 using namespace clara;

projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp

@@ -30,13 +30,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include "hip/hip_runtime.h"
 #include <chrono>
 #include <thread>
-
-#ifdef _WIN64
-#define popen(x,y) _popen(x,y)
-#define pclose(x) _pclose(x)
-#define setenv(x,y,z) _putenv_s(x,y)
-#define unsetenv(x) _putenv_s(x,"")
-#endif
+#include "test_common.h"
 
 using namespace std;
 

projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp

@@ -29,9 +29,6 @@ THE SOFTWARE.
 
 #include "hip/hip_runtime.h"
 #include "test_common.h"
-#ifdef _WIN64
-#define aligned_alloc _aligned_malloc
-#endif
 
 bool p_async = false;
 

projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp

@@ -29,12 +29,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <assert.h>
 #include <string>
 #include "hip/hip_runtime.h"
-
-#ifdef _WIN64
-#define popen(x,y) _popen(x,y)
-#define pclose(x) _pclose(x)
-#define setenv(x,y,z) _putenv_s(x,y)
-#endif
+#include "test_common.h"
 
 using namespace std;
 

projects/clr/hipamd/tests/src/test_common.h

@@ -95,6 +95,14 @@ THE SOFTWARE.
         }                                                                                          \
     }
 
+#ifdef _WIN64
+#include <tchar.h>
+#define aligned_alloc _aligned_malloc
+#define popen(x,y) _popen(x,y)
+#define pclose(x) _pclose(x)
+#define setenv(x,y,z) _putenv_s(x,y)
+#endif
+
 // standard command-line variables:
 extern size_t N;
 extern char memsetval;