Skip to content

Commit a19f40f

Browse files
FreddieAkeroydFreddieAkeroyd
committed
Tests really are now being run on windows
1 parent 8daa971 commit a19f40f

1 file changed

Lines changed: 54 additions & 27 deletions

File tree

‎test/CMakeLists.txt‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,59 +37,65 @@ link_directories(${HDF5_LIBRARY_DIRS}
3737
${HDF4_LIBRARY_DIRS}
3838
${MXML_LIBRARY_DIRS})
3939

40-
## doesn't seem to be needed at the moment...
41-
#if (WIN32)
42-
# set(TESTSPATH "$ENV{HDF4_ROOT}/bin;$ENV{HDF5_ROOT}/bin;$ENV{MXML_ROOT};${NEXUS_INSTALL_SHLIB};$ENV{PATH}")
43-
# STRING(REPLACE "/" "\\" TESTSPATH "${TESTSPATH}")
44-
# STRING(REPLACE ";" "\\;" TESTSPATH "${TESTSPATH}")
45-
#endif(WIN32)
46-
#if (WIN32)
47-
# set_tests_properties(NAPI-C-HDF5-test NAPI-C-HDF5-attra-test PROPERTIES ENVIRONMENT "PATH=${TESTSPATH}")
48-
#endif(WIN32)
40+
if (WIN32)
41+
set(TESTSPATH "$ENV{HDF4_ROOT}/bin;$ENV{HDF5_ROOT}/bin;$ENV{MXML_ROOT};${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR};$ENV{PATH}")
42+
STRING(REPLACE "/" "\\" TESTSPATH "${TESTSPATH}")
43+
STRING(REPLACE "\\;" ";" TESTSPATH "${TESTSPATH}")
44+
STRING(REPLACE ";" "\\;" TESTSPATH "${TESTSPATH}")
45+
endif(WIN32)
4946

5047
#------------------------------------------------------------------------------
5148
# In all cases we have to build the C-tests
5249
#------------------------------------------------------------------------------
5350
if(WITH_HDF5)
5451
add_executable(napi_test_hdf5 napi_test.c)
5552
target_link_libraries(napi_test_hdf5 NeXus_Shared_Library)
56-
add_test(NAME "NAPI-C-HDF5-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_hdf5)
53+
add_test(NAME "NAPI-C-HDF5-test" COMMAND napi_test_hdf5)
5754

5855
add_executable(napi_attra_test_hdf5 napi_attra_test.c)
5956
target_link_libraries(napi_attra_test_hdf5 NeXus_Shared_Library)
60-
add_test(NAME "NAPI-C-HDF5-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_hdf5)
57+
add_test(NAME "NAPI-C-HDF5-attra-test" COMMAND napi_attra_test_hdf5)
6158

59+
if (WIN32)
60+
set_property(TEST "NAPI-C-HDF5-test" "NAPI-C-HDF5-attra-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
61+
endif(WIN32)
6262
endif()
6363

6464
if(WITH_HDF4)
6565
add_executable(napi_test_hdf4 napi_test.c)
6666
target_link_libraries(napi_test_hdf4 NeXus_Shared_Library)
6767
add_test(NAME "NAPI-C-HDF4-test"
68-
COMMAND ${CMAKE_COMMAND} -E environment napi_test_hdf4)
68+
COMMAND napi_test_hdf4)
6969

7070
add_executable(napi_attra_test_hdf4 napi_attra_test.c)
7171
target_link_libraries(napi_attra_test_hdf4 NeXus_Shared_Library)
72-
add_test(NAME "NAPI-C-HDF4-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_hdf4)
72+
add_test(NAME "NAPI-C-HDF4-attra-test" COMMAND napi_attra_test_hdf4)
7373
set_tests_properties("NAPI-C-HDF4-attra-test" PROPERTIES WILL_FAIL TRUE)
7474

75+
if (WIN32)
76+
set_property(TEST "NAPI-C-HDF4-test" "NAPI-C-HDF4-attra-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
77+
endif(WIN32)
7578
endif()
7679

7780
if(WITH_MXML)
7881
add_executable(napi_test-xml napi_test.c)
7982
target_link_libraries(napi_test-xml NeXus_Shared_Library)
8083
add_test(NAME "NAPI-C-MXML-test"
81-
COMMAND ${CMAKE_COMMAND} -E environment napi_test-xml)
84+
COMMAND napi_test-xml)
8285

8386
add_executable(napi_test-xml-table napi_test.c)
8487
target_link_libraries(napi_test-xml-table NeXus_Shared_Library)
8588
add_test(NAME "NAPI-C-MXML-TABLE-test"
86-
COMMAND ${CMAKE_COMMAND} -E environment napi_test-xml-table)
89+
COMMAND napi_test-xml-table)
8790

8891
add_executable(napi_attra_test_xml napi_attra_test.c)
8992
target_link_libraries(napi_attra_test_xml NeXus_Shared_Library)
90-
add_test(NAME "NAPI-C-MXML-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_xml)
93+
add_test(NAME "NAPI-C-MXML-attra-test" COMMAND napi_attra_test_xml)
9194
set_tests_properties("NAPI-C-MXML-attra-test" PROPERTIES WILL_FAIL TRUE)
9295

96+
if (WIN32)
97+
set_property(TEST "NAPI-C-MXML-test" "NAPI-C-MXML-TABLE-test" "NAPI-C-MXML-attra-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
98+
endif(WIN32)
9399
endif()
94100

95101
#------------------------------------------------------------------------------
@@ -98,15 +104,21 @@ endif()
98104
add_executable(leak_test1 leak_test1.c)
99105
target_link_libraries(leak_test1 NeXus_Shared_Library)
100106
add_test(NAME "NAPI-C-leak-test-1"
101-
COMMAND ${CMAKE_COMMAND} -E environment leak_test1)
107+
COMMAND leak_test1)
108+
if (WIN32)
109+
set_property(TEST "NAPI-C-leak-test-1" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
110+
endif(WIN32)
102111

103112
#------------------------------------------------------------------------------
104113
# Add test for unlimited dimensions
105114
#------------------------------------------------------------------------------
106115
add_executable(test_nxunlimited test_nxunlimited.c)
107116
target_link_libraries(test_nxunlimited NeXus_Shared_Library)
108117
add_test(NAME "NAPI-C-test-nxunlimited"
109-
COMMAND ${CMAKE_COMMAND} -E environment test_nxunlimited)
118+
COMMAND test_nxunlimited)
119+
if (WIN32)
120+
set_property(TEST "NAPI-C-test-nxunlimited" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
121+
endif(WIN32)
110122

111123

112124
#------------------------------------------------------------------------------
@@ -119,19 +131,28 @@ if(ENABLE_CXX)
119131
if(WITH_HDF5)
120132
add_executable(napi_test_cpp-hdf5 napi_test_cpp.cxx)
121133
target_link_libraries(napi_test_cpp-hdf5 NeXus_CPP_Shared_Library)
122-
add_test(NAME "NAPI-C++-HDF5-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-hdf5)
134+
add_test(NAME "NAPI-C++-HDF5-test" COMMAND napi_test_cpp-hdf5)
135+
if (WIN32)
136+
set_property(TEST "NAPI-C++-HDF5-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
137+
endif(WIN32)
123138
endif()
124139

125140
if(WITH_HDF4)
126141
add_executable(napi_test_cpp-hdf4 napi_test_cpp.cxx)
127142
target_link_libraries(napi_test_cpp-hdf4 NeXus_CPP_Shared_Library)
128-
add_test(NAME "NAPI-C++-HDF4-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-hdf4)
143+
add_test(NAME "NAPI-C++-HDF4-test" COMMAND napi_test_cpp-hdf4)
144+
if (WIN32)
145+
set_property(TEST "NAPI-C++-HDF4-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
146+
endif(WIN32)
129147
endif()
130148

131149
if(WITH_MXML)
132150
add_executable(napi_test_cpp-xml napi_test_cpp.cxx)
133151
target_link_libraries(napi_test_cpp-xml NeXus_CPP_Shared_Library)
134-
add_test(NAME "NAPI-C++-MXML-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-xml)
152+
add_test(NAME "NAPI-C++-MXML-test" COMMAND napi_test_cpp-xml)
153+
if (WIN32)
154+
set_property(TEST "NAPI-C++-MXML-test" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
155+
endif(WIN32)
135156

136157
# add_executable(napi_test_cpp-xml-table napi_test_cpp.cxx)
137158
# target_link_libraries(napi_test_cpp-xml-table NeXus_CPP_Shared_Library
@@ -147,12 +168,18 @@ if(ENABLE_CXX)
147168
add_executable(leak_test2 leak_test2.cxx)
148169
target_link_libraries(leak_test2 NeXus_CPP_Shared_Library)
149170
add_test(NAME "NAPI-C++-leak-test-2"
150-
COMMAND ${CMAKE_COMMAND} -E environment leak_test2)
171+
COMMAND leak_test2)
172+
if (WIN32)
173+
set_property(TEST "NAPI-C++-leak-test-2" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
174+
endif(WIN32)
151175

152176
add_executable(leak_test3 leak_test3.cxx)
153177
target_link_libraries(leak_test3 NeXus_CPP_Shared_Library)
154178
add_test(NAME "NAPI-C++-leak-test-3"
155-
COMMAND ${CMAKE_COMMAND} -E environment leak_test3)
179+
COMMAND leak_test3)
180+
if (WIN32)
181+
set_property(TEST "NAPI-C++-leak-test-3" APPEND PROPERTY ENVIRONMENT "PATH=${TESTSPATH}")
182+
endif(WIN32)
156183
endif()
157184

158185
if(ENABLE_FORTRAN77)
@@ -163,21 +190,21 @@ if(ENABLE_FORTRAN77)
163190
add_executable(napif4_test napif4_test.f)
164191
target_link_libraries(napif4_test NeXus_F77_Shared_Library)
165192
add_test(NAME "NAPI-F77-HDF4-test"
166-
COMMAND ${CMAKE_COMMAND} -E environment napif4_test)
193+
COMMAND napif4_test)
167194
endif()
168195

169196
if(WITH_HDF5)
170197
add_executable(napif5_test napif5_test.f)
171198
target_link_libraries(napif5_test NeXus_F77_Shared_Library)
172199
add_test(NAME "NAPI-F77-HDF5-test"
173-
COMMAND ${CMAKE_COMMAND} -E environment napif5_test)
200+
COMMAND napif5_test)
174201
endif()
175202

176203
if(WITH_MXML)
177204
add_executable(napif_test napif_test.f)
178205
target_link_libraries(napif_test NeXus_F77_Shared_Library)
179206
add_test(NAME "NAPI-F77-XML-test"
180-
COMMAND ${CMAKE_COMMAND} -E environment napif_test)
207+
COMMAND napif_test)
181208
endif()
182209

183210
endif()
@@ -187,7 +214,7 @@ if(ENABLE_FORTRAN90)
187214
include_directories(${PROJECT_BINARY_DIR}/bindings/f90)
188215
add_executable(NXtestf90 NXtest.f90)
189216
target_link_libraries(NXtestf90 NeXus_F90_Shared_Library)
190-
add_test(NAME "Fortran-90-test" COMMAND ${CMAKE_COMMAND} -E environment NXtestf90)
217+
add_test(NAME "Fortran-90-test" COMMAND NXtestf90)
191218
endif()
192219

193220

0 commit comments

Comments
 (0)