Skip to content

Commit 8daa971

Browse files
FreddieAkeroydFreddieAkeroyd
committed
Export environment so tests run on Windows
1 parent 1e02d17 commit 8daa971

1 file changed

Lines changed: 34 additions & 20 deletions

File tree

‎test/CMakeLists.txt‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,46 +37,59 @@ 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)
49+
4050
#------------------------------------------------------------------------------
4151
# In all cases we have to build the C-tests
4252
#------------------------------------------------------------------------------
4353
if(WITH_HDF5)
4454
add_executable(napi_test_hdf5 napi_test.c)
4555
target_link_libraries(napi_test_hdf5 NeXus_Shared_Library)
46-
add_test(NAME "NAPI-C-HDF5-test" COMMAND napi_test_hdf5)
56+
add_test(NAME "NAPI-C-HDF5-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_hdf5)
4757

4858
add_executable(napi_attra_test_hdf5 napi_attra_test.c)
4959
target_link_libraries(napi_attra_test_hdf5 NeXus_Shared_Library)
50-
add_test(NAME "NAPI-C-HDF5-attra-test" COMMAND napi_attra_test_hdf5)
60+
add_test(NAME "NAPI-C-HDF5-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_hdf5)
61+
5162
endif()
5263

5364
if(WITH_HDF4)
5465
add_executable(napi_test_hdf4 napi_test.c)
5566
target_link_libraries(napi_test_hdf4 NeXus_Shared_Library)
5667
add_test(NAME "NAPI-C-HDF4-test"
57-
COMMAND napi_test_hdf4)
68+
COMMAND ${CMAKE_COMMAND} -E environment napi_test_hdf4)
5869

5970
add_executable(napi_attra_test_hdf4 napi_attra_test.c)
6071
target_link_libraries(napi_attra_test_hdf4 NeXus_Shared_Library)
61-
add_test(NAME "NAPI-C-HDF4-attra-test" COMMAND napi_attra_test_hdf4)
72+
add_test(NAME "NAPI-C-HDF4-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_hdf4)
6273
set_tests_properties("NAPI-C-HDF4-attra-test" PROPERTIES WILL_FAIL TRUE)
74+
6375
endif()
6476

6577
if(WITH_MXML)
6678
add_executable(napi_test-xml napi_test.c)
6779
target_link_libraries(napi_test-xml NeXus_Shared_Library)
6880
add_test(NAME "NAPI-C-MXML-test"
69-
COMMAND napi_test-xml)
81+
COMMAND ${CMAKE_COMMAND} -E environment napi_test-xml)
7082

7183
add_executable(napi_test-xml-table napi_test.c)
7284
target_link_libraries(napi_test-xml-table NeXus_Shared_Library)
7385
add_test(NAME "NAPI-C-MXML-TABLE-test"
74-
COMMAND napi_test-xml-table)
86+
COMMAND ${CMAKE_COMMAND} -E environment napi_test-xml-table)
7587

7688
add_executable(napi_attra_test_xml napi_attra_test.c)
7789
target_link_libraries(napi_attra_test_xml NeXus_Shared_Library)
78-
add_test(NAME "NAPI-C-MXML-attra-test" COMMAND napi_attra_test_xml)
90+
add_test(NAME "NAPI-C-MXML-attra-test" COMMAND ${CMAKE_COMMAND} -E environment napi_attra_test_xml)
7991
set_tests_properties("NAPI-C-MXML-attra-test" PROPERTIES WILL_FAIL TRUE)
92+
8093
endif()
8194

8295
#------------------------------------------------------------------------------
@@ -85,15 +98,15 @@ endif()
8598
add_executable(leak_test1 leak_test1.c)
8699
target_link_libraries(leak_test1 NeXus_Shared_Library)
87100
add_test(NAME "NAPI-C-leak-test-1"
88-
COMMAND leak_test1)
101+
COMMAND ${CMAKE_COMMAND} -E environment leak_test1)
89102

90103
#------------------------------------------------------------------------------
91104
# Add test for unlimited dimensions
92105
#------------------------------------------------------------------------------
93106
add_executable(test_nxunlimited test_nxunlimited.c)
94107
target_link_libraries(test_nxunlimited NeXus_Shared_Library)
95108
add_test(NAME "NAPI-C-test-nxunlimited"
96-
COMMAND test_nxunlimited)
109+
COMMAND ${CMAKE_COMMAND} -E environment test_nxunlimited)
97110

98111

99112
#------------------------------------------------------------------------------
@@ -106,25 +119,26 @@ if(ENABLE_CXX)
106119
if(WITH_HDF5)
107120
add_executable(napi_test_cpp-hdf5 napi_test_cpp.cxx)
108121
target_link_libraries(napi_test_cpp-hdf5 NeXus_CPP_Shared_Library)
109-
add_test(NAME "NAPI-C++-HDF5-test" COMMAND napi_test_cpp-hdf5)
122+
add_test(NAME "NAPI-C++-HDF5-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-hdf5)
110123
endif()
111124

112125
if(WITH_HDF4)
113126
add_executable(napi_test_cpp-hdf4 napi_test_cpp.cxx)
114127
target_link_libraries(napi_test_cpp-hdf4 NeXus_CPP_Shared_Library)
115-
add_test(NAME "NAPI-C++-HDF4-test" COMMAND napi_test_cpp-hdf4)
128+
add_test(NAME "NAPI-C++-HDF4-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-hdf4)
116129
endif()
117130

118131
if(WITH_MXML)
119132
add_executable(napi_test_cpp-xml napi_test_cpp.cxx)
120133
target_link_libraries(napi_test_cpp-xml NeXus_CPP_Shared_Library)
121-
add_test(NAME "NAPI-C++-MXML-test" COMMAND napi_test_cpp-xml)
122-
134+
add_test(NAME "NAPI-C++-MXML-test" COMMAND ${CMAKE_COMMAND} -E environment napi_test_cpp-xml)
135+
123136
# add_executable(napi_test_cpp-xml-table napi_test_cpp.cxx)
124137
# target_link_libraries(napi_test_cpp-xml-table NeXus_CPP_Shared_Library
125138
# ${NAPI_LINK_LIBS})
126-
# add_test(NAME "NAPI-C++-MXML-TABLE-test"
139+
# add_test(NAME "NAPI-C++-MXML-TABLE-test"
127140
# COMMAND napi_test_cpp-xml-table)
141+
128142
endif()
129143

130144
#--------------------------------------------------------------------------
@@ -133,12 +147,12 @@ if(ENABLE_CXX)
133147
add_executable(leak_test2 leak_test2.cxx)
134148
target_link_libraries(leak_test2 NeXus_CPP_Shared_Library)
135149
add_test(NAME "NAPI-C++-leak-test-2"
136-
COMMAND leak_test2)
150+
COMMAND ${CMAKE_COMMAND} -E environment leak_test2)
137151

138152
add_executable(leak_test3 leak_test3.cxx)
139153
target_link_libraries(leak_test3 NeXus_CPP_Shared_Library)
140154
add_test(NAME "NAPI-C++-leak-test-3"
141-
COMMAND leak_test3)
155+
COMMAND ${CMAKE_COMMAND} -E environment leak_test3)
142156
endif()
143157

144158
if(ENABLE_FORTRAN77)
@@ -149,21 +163,21 @@ if(ENABLE_FORTRAN77)
149163
add_executable(napif4_test napif4_test.f)
150164
target_link_libraries(napif4_test NeXus_F77_Shared_Library)
151165
add_test(NAME "NAPI-F77-HDF4-test"
152-
COMMAND napif4_test)
166+
COMMAND ${CMAKE_COMMAND} -E environment napif4_test)
153167
endif()
154168

155169
if(WITH_HDF5)
156170
add_executable(napif5_test napif5_test.f)
157171
target_link_libraries(napif5_test NeXus_F77_Shared_Library)
158172
add_test(NAME "NAPI-F77-HDF5-test"
159-
COMMAND napif5_test)
173+
COMMAND ${CMAKE_COMMAND} -E environment napif5_test)
160174
endif()
161175

162176
if(WITH_MXML)
163177
add_executable(napif_test napif_test.f)
164178
target_link_libraries(napif_test NeXus_F77_Shared_Library)
165179
add_test(NAME "NAPI-F77-XML-test"
166-
COMMAND napif_test)
180+
COMMAND ${CMAKE_COMMAND} -E environment napif_test)
167181
endif()
168182

169183
endif()
@@ -173,7 +187,7 @@ if(ENABLE_FORTRAN90)
173187
include_directories(${PROJECT_BINARY_DIR}/bindings/f90)
174188
add_executable(NXtestf90 NXtest.f90)
175189
target_link_libraries(NXtestf90 NeXus_F90_Shared_Library)
176-
add_test(NAME "Fortran-90-test" COMMAND NXtestf90)
190+
add_test(NAME "Fortran-90-test" COMMAND ${CMAKE_COMMAND} -E environment NXtestf90)
177191
endif()
178192

179193

0 commit comments

Comments
 (0)