You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/05/05 18:48:36 UTC
geode-native git commit: GEODE-2877: Fixes integration tests
generation issues on Windows.
Repository: geode-native
Updated Branches:
refs/heads/develop 1365aade1 -> 9c5db5626
GEODE-2877: Fixes integration tests generation issues on Windows.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9c5db562
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9c5db562
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9c5db562
Branch: refs/heads/develop
Commit: 9c5db56265324e48af51daa5f84f692b2ae45f49
Parents: 1365aad
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Fri May 5 11:47:44 2017 -0700
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Fri May 5 11:47:44 2017 -0700
----------------------------------------------------------------------
src/clicache/integration-test/CMakeLists.txt | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/9c5db562/src/clicache/integration-test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CMakeLists.txt b/src/clicache/integration-test/CMakeLists.txt
index e054cb5..be5e424 100644
--- a/src/clicache/integration-test/CMakeLists.txt
+++ b/src/clicache/integration-test/CMakeLists.txt
@@ -63,7 +63,6 @@ foreach( lib ssl xerces-c sqlite )
set(PATH ${PATH} ${runtime_path})
endforeach()
-set (TEST_SCRIPT_SUFFIX .bat)
file(GLOB SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
foreach(FILE ${SOURCES})
@@ -86,11 +85,10 @@ foreach(FILE ${SOURCES})
# Get the test class (NewAPI tests have N in the file name but not test class name)
string(REGEX REPLACE "N$" "" TESTCLASS ${TEST})
- generate_config(${CMAKE_CURRENT_SOURCE_DIR}/test.bat.in ${CMAKE_CURRENT_BINARY_DIR}/.${TEST}.bat.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${TEST}${TEST_SCRIPT_SUFFIX})
- set(TEST_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${TEST}${TEST_SCRIPT_SUFFIX})
- add_test(NAME ${TEST}
- COMMAND ${TEST_COMMAND}
- )
+ set(TEST_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${TEST}.bat)
+ generate_config(${CMAKE_CURRENT_SOURCE_DIR}/test.bat.in ${CMAKE_CURRENT_BINARY_DIR}/.${TEST}.bat.in ${TEST_SCRIPT})
+
+ add_test(NAME ${TEST} COMMAND ${TEST_SCRIPT})
set_property(TEST ${TEST} PROPERTY LABELS STABLE)
endif()
endif()