Skip to content

Commit 8d4ca2b

Browse files
author
Martin D. Weinberg
committed
Do not build ICs if utils build is disabled
1 parent 00e3f60 commit 8d4ca2b

1 file changed

Lines changed: 99 additions & 97 deletions

File tree

‎tests/CMakeLists.txt‎

Lines changed: 99 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -56,105 +56,107 @@ if(ENABLE_NBODY)
5656
add_test(NAME expExecuteTest
5757
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/src/exp -v)
5858

59-
# Makes some spherical ICs using utils/ICs/gensph
60-
add_test(NAME makeICTest
61-
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gensph -N 10000 -i SLGridSph.model
62-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
63-
64-
# Runs those ICs using exp
65-
add_test(NAME expNbodyTest
66-
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/src/exp config.yml
67-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
68-
69-
set_tests_properties(expNbodyTest PROPERTIES DEPENDS makeICTest)
70-
71-
# Check OUTLOG file for a sane 2T/W mean and stdv
72-
add_test(NAME expNbodyCheck2TW
73-
COMMAND ${CMAKE_COMMAND} -E env
74-
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
75-
${PYTHON_EXECUTABLE} check.py
76-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
77-
78-
set_tests_properties(expNbodyCheck2TW PROPERTIES DEPENDS expNbodyTest LABELS "long")
79-
80-
# This adds a coefficient read test using pyEXP only if
81-
# expNbodyTest is run and pyEXP has been built
82-
if(ENABLE_PYEXP)
83-
# Read coefficient file with pyEXP
84-
add_test(NAME pyEXPCoefReadTest
85-
COMMAND ${CMAKE_COMMAND} -E env
86-
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
87-
${PYTHON_EXECUTABLE} readCoefs.py
88-
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
89-
set_tests_properties(pyEXPCoefReadTest PROPERTIES DEPENDS expNbodyTest LABELS "long")
90-
91-
add_test(NAME pyEXPCoefMatrixTest
92-
COMMAND ${CMAKE_COMMAND} -E env
93-
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
94-
${PYTHON_EXECUTABLE} changeCoefs.py
95-
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
96-
set_tests_properties(pyEXPCoefMatrixTest PROPERTIES DEPENDS expNbodyTest LABELS "long")
97-
98-
add_test(NAME pyEXPCoefCreateTest
99-
COMMAND ${CMAKE_COMMAND} -E env
100-
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
101-
${PYTHON_EXECUTABLE} createCoefs.py
102-
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
103-
set_tests_properties(pyEXPCoefCreateTest PROPERTIES LABELS "quick")
59+
if (ENABLE_UTILS)
60+
# Makes some spherical ICs using utils/ICs/gensph
61+
add_test(NAME makeICTest
62+
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gensph -N 10000 -i SLGridSph.model
63+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
64+
65+
# Runs those ICs using exp
66+
add_test(NAME expNbodyTest
67+
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/src/exp config.yml
68+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
69+
70+
set_tests_properties(expNbodyTest PROPERTIES DEPENDS makeICTest)
71+
72+
# Check OUTLOG file for a sane 2T/W mean and stdv
73+
add_test(NAME expNbodyCheck2TW
74+
COMMAND ${CMAKE_COMMAND} -E env
75+
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
76+
${PYTHON_EXECUTABLE} check.py
77+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
78+
79+
set_tests_properties(expNbodyCheck2TW PROPERTIES DEPENDS expNbodyTest LABELS "long")
80+
81+
# This adds a coefficient read test using pyEXP only if
82+
# expNbodyTest is run and pyEXP has been built
83+
if(ENABLE_PYEXP)
84+
# Read coefficient file with pyEXP
85+
add_test(NAME pyEXPCoefReadTest
86+
COMMAND ${CMAKE_COMMAND} -E env
87+
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
88+
${PYTHON_EXECUTABLE} readCoefs.py
89+
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
90+
set_tests_properties(pyEXPCoefReadTest PROPERTIES DEPENDS expNbodyTest LABELS "long")
91+
92+
add_test(NAME pyEXPCoefMatrixTest
93+
COMMAND ${CMAKE_COMMAND} -E env
94+
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
95+
${PYTHON_EXECUTABLE} changeCoefs.py
96+
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
97+
set_tests_properties(pyEXPCoefMatrixTest PROPERTIES DEPENDS expNbodyTest LABELS "long")
98+
99+
add_test(NAME pyEXPCoefCreateTest
100+
COMMAND ${CMAKE_COMMAND} -E env
101+
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
102+
${PYTHON_EXECUTABLE} createCoefs.py
103+
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Halo")
104+
set_tests_properties(pyEXPCoefCreateTest PROPERTIES LABELS "quick")
105+
endif()
106+
107+
# A separate test to remove the generated files if they all exist;
108+
# perhaps there is a better way?
109+
add_test(NAME removeTempFiles
110+
COMMAND ${CMAKE_COMMAND} -E remove
111+
config.run0.yml current.processor.rates.run0 new.bods
112+
OUTLOG.run0 run0.levels SLGridSph.cache.run0 test.grid
113+
outcoef.halo.run0 SLGridSph.cache.run0
114+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
115+
116+
# Remove the temporary files
117+
set_tests_properties(removeTempFiles PROPERTIES DEPENDS expNbodyCheck2TW
118+
REQUIRED_FILES "config.run0.yml;current.processor.rates.run0;new.bods;run0.levels;SLGridSph.cache.run0;test.grid;"
119+
)
120+
121+
# Makes some cube ICs using utils/ICs/cubeics
122+
add_test(NAME makeCubeICTest
123+
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/cubeics -N 4000 -z -d 2,2,2
124+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
125+
126+
# Runs those ICs using exp
127+
add_test(NAME expCubeTest
128+
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/src/exp
129+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
130+
131+
set_tests_properties(expCubeTest PROPERTIES DEPENDS makeCubeICTest)
132+
133+
# Check OUTLOG file for mean position
134+
add_test(NAME expCubeCheckPos
135+
COMMAND ${CMAKE_COMMAND} -E env
136+
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
137+
${PYTHON_EXECUTABLE} check.py
138+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
139+
140+
set_tests_properties(expCubeCheckPos PROPERTIES DEPENDS expCubeTest)
141+
142+
# A separate test to remove the generated files if they all exist
143+
add_test(NAME removeCubeFiles
144+
COMMAND ${CMAKE_COMMAND} -E remove
145+
config.runS.yml current.processor.rates.runS cube.bods
146+
OUTLOG.runS runS.levels
147+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
148+
149+
# Remove the temporary files
150+
set_tests_properties(removeCubeFiles PROPERTIES DEPENDS expCubeCheckPos
151+
REQUIRED_FILES "config.runS.yml;current.processor.rates.runS;cube.bods;OUTLOG.runS;runS.levels;")
152+
153+
# Set labels for pyEXP tests
154+
set_tests_properties(expExecuteTest PROPERTIES LABELS "quick")
155+
set_tests_properties(makeICTest expNbodyTest expNbodyCheck2TW
156+
removeTempFiles makeCubeICTest expCubeTest removeCubeFiles
157+
PROPERTIES LABELS "long")
104158
endif()
105159

106-
# A separate test to remove the generated files if they all exist;
107-
# perhaps there is a better way?
108-
add_test(NAME removeTempFiles
109-
COMMAND ${CMAKE_COMMAND} -E remove
110-
config.run0.yml current.processor.rates.run0 new.bods
111-
OUTLOG.run0 run0.levels SLGridSph.cache.run0 test.grid
112-
outcoef.halo.run0 SLGridSph.cache.run0
113-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
114-
115-
# Remove the temporary files
116-
set_tests_properties(removeTempFiles PROPERTIES DEPENDS expNbodyCheck2TW
117-
REQUIRED_FILES "config.run0.yml;current.processor.rates.run0;new.bods;run0.levels;SLGridSph.cache.run0;test.grid;"
118-
)
119-
120-
# Makes some cube ICs using utils/ICs/cubeics
121-
add_test(NAME makeCubeICTest
122-
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/cubeics -N 4000 -z -d 2,2,2
123-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
124-
125-
# Runs those ICs using exp
126-
add_test(NAME expCubeTest
127-
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/src/exp
128-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
129-
130-
set_tests_properties(expCubeTest PROPERTIES DEPENDS makeCubeICTest)
131-
132-
# Check OUTLOG file for mean position
133-
add_test(NAME expCubeCheckPos
134-
COMMAND ${CMAKE_COMMAND} -E env
135-
PYTHONPATH=${CMAKE_BINARY_DIR}/pyEXP:$ENV{PYTHONPATH}
136-
${PYTHON_EXECUTABLE} check.py
137-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
138-
139-
set_tests_properties(expCubeCheckPos PROPERTIES DEPENDS expCubeTest)
140-
141-
# A separate test to remove the generated files if they all exist
142-
add_test(NAME removeCubeFiles
143-
COMMAND ${CMAKE_COMMAND} -E remove
144-
config.runS.yml current.processor.rates.runS cube.bods
145-
OUTLOG.runS runS.levels
146-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Cube)
147-
148-
# Remove the temporary files
149-
set_tests_properties(removeCubeFiles PROPERTIES DEPENDS expCubeCheckPos
150-
REQUIRED_FILES "config.runS.yml;current.processor.rates.runS;cube.bods;OUTLOG.runS;runS.levels;")
151-
152-
# Set labels for pyEXP tests
153-
set_tests_properties(expExecuteTest PROPERTIES LABELS "quick")
154-
set_tests_properties(makeICTest expNbodyTest expNbodyCheck2TW
155-
removeTempFiles makeCubeICTest expCubeTest removeCubeFiles
156-
PROPERTIES LABELS "long")
157-
158160
endif()
159161

160162
# Tests that should work for any configuration. Nothing so far. This

0 commit comments

Comments
 (0)