Skip to content

Commit 6a3999b

Browse files
disable sort_surfs tests
This test relied on unreliable methods to link some functions. This can be rectified via other PRs.
1 parent 059aaf7 commit 6a3999b

File tree

1 file changed

+9
-95
lines changed

1 file changed

+9
-95
lines changed

Tests/CMakeLists.txt

Lines changed: 9 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -273,100 +273,14 @@ if ((NOT MACOSX) AND UNIX)
273273
endif()
274274

275275
# sort_surfs
276-
add_executable(sort_surfs sort_surfs.c
277-
../Source/smokeview/menus.c
278-
../Source/smokeview/IOscript.c
279-
../Source/smokeview/IOshooter.c
280-
../Source/smokeview/colortimebar.c
281-
../Source/smokeview/camera.c
282-
../Source/smokeview/IOgeometry.c
283-
../Source/smokeview/IOwui.c
284-
../Source/smokeview/IOobjects.c
285-
../Source/smokeview/IOtour.c
286-
../Source/smokeview/getdatacolors.c
287-
../Source/smokeview/smokeview.c
288-
../Source/smokeview/output.c
289-
../Source/smokeview/renderimage.c
290-
../Source/smokeview/renderhtml.c
291-
../Source/smokeview/getdatabounds.c
292-
../Source/smokeview/readsmv.c
293-
../Source/smokeview/IOvolsmoke.c
294-
../Source/smokeview/IOsmoke.c
295-
../Source/smokeview/IOplot3d.c
296-
../Source/smokeview/IOplot2d.c
297-
../Source/smokeview/IOslice.c
298-
../Source/smokeview/IOhvac.c
299-
../Source/smokeview/IOboundary.c
300-
../Source/smokeview/IOpart.c
301-
../Source/smokeview/IOzone.c
302-
../Source/smokeview/IOiso.c
303-
../Source/smokeview/callbacks.c
304-
../Source/smokeview/drawGeometry.c
305-
../Source/smokeview/skybox.c
306-
../Source/smokeview/update.c
307-
../Source/smokeview/viewports.c
308-
../Source/smokeview/smv_geometry.c
309-
../Source/smokeview/showscene.c
310-
../Source/smokeview/infoheader.c
311-
../Source/smokeview/startup.c
312-
../Source/smokeview/shaders.c
313-
../Source/smokeview/unit.c
314-
../Source/smokeview/colortable.c
315-
../Source/smokeview/command_args.c
316-
../Source/smokeview/c_api.c
317-
)
318-
319-
target_sources(sort_surfs PRIVATE
320-
../Source/smokeview/glui_smoke.cpp
321-
../Source/smokeview/glui_clip.cpp
322-
../Source/smokeview/glui_stereo.cpp
323-
../Source/smokeview/glui_geometry.cpp
324-
../Source/smokeview/glui_motion.cpp
325-
../Source/smokeview/glui_bounds.cpp
326-
../Source/smokeview/glui_colorbar.cpp
327-
../Source/smokeview/glui_display.cpp
328-
../Source/smokeview/glui_tour.cpp
329-
../Source/smokeview/glui_trainer.cpp
330-
../Source/smokeview/glui_objects.cpp
331-
../Source/smokeview/glui_shooter.cpp
332-
)
333-
334-
target_include_directories(sort_surfs PRIVATE
335-
../Tests
336-
../Source/shared
337-
../Source/glew
338-
../Source/smokeview
339-
)
340-
target_link_libraries(sort_surfs PRIVATE libsmv)
341-
if (WIN32)
342-
target_include_directories(sort_surfs PRIVATE ../Source/glut_gl)
343-
else()
344-
target_include_directories(sort_surfs PRIVATE ../Source/glui_gl)
345-
endif ()
346-
target_link_libraries(sort_surfs PRIVATE glui_static)
347-
target_include_directories(sort_surfs PRIVATE ../Source/glui_v2_1_beta)
348-
if (MACOSX)
349-
add_definitions(-Dpp_NOQUARTZ)
350-
target_link_libraries(sort_surfs PRIVATE "-framework OpenGL" "-framework GLUT")
351-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
352-
elseif (GLUT_FOUND)
353-
target_link_libraries(sort_surfs PRIVATE GLUT::GLUT)
354-
else()
355-
target_link_libraries(sort_surfs PRIVATE glut32_static)
356-
endif ()
357-
target_link_libraries(sort_surfs PRIVATE GLEW::GLEW)
358-
if (WIN32)
359-
target_include_directories(sort_surfs PRIVATE ../Source/pthreads)
360-
endif()
361-
if ((NOT MACOSX) AND UNIX)
362-
target_link_libraries(sort_surfs PRIVATE m)
363-
endif()
364-
target_link_libraries(sort_surfs PRIVATE JPEG::JPEG)
365-
target_link_libraries(sort_surfs PRIVATE PNG::PNG)
366-
target_link_libraries(sort_surfs PRIVATE ZLIB::ZLIB)
367-
target_link_libraries(sort_surfs PRIVATE OpenGL::GL OpenGL::GLU)
368-
276+
# add_executable(sort_surfs sort_surfs.c
277+
# )
369278

279+
# target_include_directories(sort_surfs PRIVATE
280+
# ../Tests
281+
# ../Source/shared
282+
# ../Source/glew
283+
# )
370284

371285

372286
# Arguments to this tests are <slice path> <number of frames in slice>
@@ -424,5 +338,5 @@ add_test(NAME "Mem Test"
424338
add_test(NAME "Test Root Dir"
425339
COMMAND test_root_dir)
426340

427-
add_test(NAME "Sort Surfs"
428-
COMMAND sort_surfs)
341+
# add_test(NAME "Sort Surfs"
342+
# COMMAND sort_surfs)

0 commit comments

Comments
 (0)