cmake: test: added system env path integration to tests

Change-Id: I2f7d91d4678f94835a754b007eeb0f048410b6cf

config_template.vcxproj.user

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='@CMAKE_BUILD_TYPE@|@USERCONFIG_PLATFORM@'">
+    <LocalDebuggerEnvironment>PATH=@CTESTCONFIG_PATH@;%PATH%</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>

examples/CMakeLists.txt

@@ -20,11 +20,21 @@ add_executable(simple-net-c simple_net.c)
 set_property(TARGET simple-net-c PROPERTY C_STANDARD 99)
 target_link_libraries(simple-net-c ${LIB_NAME})
 add_test(simple-net-c simple-net-c)
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        simple-net-c.vcxproj.user @ONLY)
+    set_property(TEST simple-net-c PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+endif()
 
 add_executable(simple-net-cpp simple_net.cpp)
 set_property(TARGET simple-net-cpp PROPERTY CXX_STANDARD 11)
 target_link_libraries(simple-net-cpp ${LIB_NAME})
 add_test(simple-net-cpp simple-net-cpp)
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        simple-net-cpp.vcxproj.user @ONLY)
+    set_property(TEST simple-net-cpp PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+endif()
 
 add_executable(simple-training-net-c simple_training_net.c)
 set_property(TARGET simple-training-net-c PROPERTY C_STANDARD 99)
@@ -34,6 +44,11 @@ else()
 target_link_libraries(simple-training-net-c ${LIB_NAME} m)
 endif()
 add_test(simple-training-net-c simple-training-net-c)
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        simple-training-net-c.vcxproj.user @ONLY)
+    set_property(TEST simple-training-net-c PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+endif()
 
 add_executable(simple-training-net-cpp simple_training_net.cpp)
 set_property(TARGET simple-training-net-cpp PROPERTY CXX_STANDARD 11)
@@ -43,3 +58,8 @@ else()
 target_link_libraries(simple-training-net-cpp ${LIB_NAME} m)
 endif()
 add_test(simple-training-net-cpp simple-training-net-cpp)
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        simple-training-net-cpp.vcxproj.user @ONLY)
+    set_property(TEST simple-training-net-cpp PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+endif()

tests/CMakeLists.txt

@@ -45,6 +45,11 @@ set_property(TARGET api-c PROPERTY C_STANDARD 99)
 target_link_libraries(api-c ${LIB_NAME})
 add_test(api-c api-c)
 
+if(WIN32)
+    set_property(TEST api-c PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        api-c.vcxproj.user @ONLY)
+endif()
 if(UNIX OR APPLE)
     set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c")
     add_executable(test_c_symbols-c ${test_c_symbols})

tests/benchdnn/CMakeLists.txt

@@ -31,6 +31,11 @@ include_directories(
     )
 
 add_executable(benchdnn ${SOURCES})
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        benchdnn.vcxproj.user @ONLY)
+    set_property(TARGET benchdnn PROPERTY ENVIRONMENT "PATH=${TEST_PATH}")
+endif()
 set_property(TARGET benchdnn PROPERTY CXX_STANDARD 11)
 target_link_libraries(benchdnn ${LIB_NAME})
 if(UNIX AND NOT APPLE)
@@ -47,8 +52,18 @@ add_custom_target(test_conv
     DEPENDS benchdnn
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        test_conv.vcxproj.user @ONLY)
+    set_property(TARGET test_conv PROPERTY ENVIRONMENT "PATH=${TEST_PATH}")
+endif()
 add_custom_target(test_conv_regression
     COMMAND benchdnn --conv --batch=inputs/test_conv_regression
     DEPENDS benchdnn
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
+if(WIN32)
+    configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+        test_conv_regression.vcxproj.user @ONLY)
+    set_property(TARGET test_conv_regression PROPERTY ENVIRONMENT "PATH=${TEST_PATH}")
+endif()

tests/gtests/CMakeLists.txt

@@ -57,6 +57,11 @@ foreach(TEST_FILE ${PRIM_TEST_CASES_SRC})
     add_executable(${CURR_APP_NAME} ${MAIN_SRC_GTEST} ${TEST_FILE})
     target_link_libraries(${CURR_APP_NAME} mkldnn mkldnn_gtest)
     add_test(${CURR_APP_NAME} ${CURR_APP_NAME})
+    if(WIN32)
+        configure_file(${CMAKE_SOURCE_DIR}/config_template.vcxproj.user
+            ${CURR_APP_NAME}.vcxproj.user @ONLY)
+        set_property(TEST ${CURR_APP_NAME} PROPERTY ENVIRONMENT "PATH=${CTESTCONFIG_PATH}")
+    endif()
 endforeach()
 
 # we need to have either this or the add_test above; disabling for now...