X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tests%2FCMakeLists.txt;h=77c4dd6122c0083caf6514cd1a5188564e9f7b8d;hb=ed2af11102ec261c49740598c97baa0a2993f95f;hp=d8f29f4dbf20b2bfd6d0efbe126a1c51674ab177;hpb=855b5b513d92c565be762eca14ac16f01210ce97;p=openjpeg.git diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d8f29f4d..77c4dd61 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,62 +1,100 @@ # Tests -INCLUDE_DIRECTORIES( - ${OPENJPEG_SOURCE_DIR}/libopenjpeg - ${OPENJPEG_SOURCE_DIR}/applications/codec - ${OPENJPEG_SOURCE_DIR}/applications/common +include_directories( + ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h + ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h + ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 + ${OPENJPEG_SOURCE_DIR}/src/bin/jp2 + ${OPENJPEG_SOURCE_DIR}/src/bin/common ${Z_INCLUDE_DIRNAME} ${PNG_INCLUDE_DIRNAME} ${TIFF_INCLUDE_DIRNAME} ) # First thing define the common source: -SET(comparePGXimages_SRCS comparePGXimages.c - ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c - ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c +set(comparePGXimages_SRCS comparePGXimages.c + ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c + ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c ) -SET(compare_dump_files_SRCS compare_dump_files.c - ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c) +set(compare_dump_files_SRCS compare_dump_files.c + ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c) -SET(compareRAWimages_SRCS compareRAWimages.c - ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c) +set(compareRAWimages_SRCS compareRAWimages.c + ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c) -ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) -TARGET_LINK_LIBRARIES(comparePGXimages +add_executable(comparePGXimages ${comparePGXimages_SRCS}) +target_link_libraries(comparePGXimages ${OPENJPEG_LIBRARY_NAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ) # To support universal exe: -IF(ZLIB_FOUND AND APPLE) - TARGET_LINK_LIBRARIES(comparePGXimages z) -ELSe(ZLIB_FOUND AND APPLE) - TARGET_LINK_LIBRARIES(comparePGXimages ${Z_LIBNAME}) -ENDIF(ZLIB_FOUND AND APPLE) +if(ZLIB_FOUND AND APPLE) + target_link_libraries(comparePGXimages z) +else(ZLIB_FOUND AND APPLE) + target_link_libraries(comparePGXimages ${Z_LIBNAME}) +endif() -ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS}) +add_executable(compare_dump_files ${compare_dump_files_SRCS}) -ADD_EXECUTABLE(j2k_random_tile_access j2k_random_tile_access.c) -TARGET_LINK_LIBRARIES(j2k_random_tile_access ${OPENJPEG_LIBRARY_NAME}) +add_executable(j2k_random_tile_access j2k_random_tile_access.c) +target_link_libraries(j2k_random_tile_access ${OPENJPEG_LIBRARY_NAME}) -ADD_EXECUTABLE(compareRAWimages ${compareRAWimages_SRCS}) +add_executable(compareRAWimages ${compareRAWimages_SRCS}) -ADD_EXECUTABLE(test_tile_encoder test_tile_encoder.c) -TARGET_LINK_LIBRARIES(test_tile_encoder ${OPENJPEG_LIBRARY_NAME}) +add_executable(test_tile_encoder test_tile_encoder.c) +target_link_libraries(test_tile_encoder ${OPENJPEG_LIBRARY_NAME}) + +# Let's try a couple of possibilities: +add_test(NAME tte0 COMMAND test_tile_encoder) +add_test(NAME tte1 COMMAND test_tile_encoder 3 2048 2048 1024 1024 8 1 tte1.j2k) +add_test(NAME tte2 COMMAND test_tile_encoder 3 2048 2048 1024 1024 8 1 tte2.jp2) +add_test(NAME tte3 COMMAND test_tile_encoder 1 2048 2048 1024 1024 8 1 tte3.j2k) +add_test(NAME tte4 COMMAND test_tile_encoder 1 256 256 128 128 8 0 tte4.j2k) +add_test(NAME tte5 COMMAND test_tile_encoder 1 512 512 256 256 8 0 tte5.j2k) +#add_test(NAME tte6 COMMAND test_tile_encoder 1 8192 8192 512 512 8 0 tte6.j2k) +#add_test(NAME tte7 COMMAND test_tile_encoder 1 32768 32768 512 512 8 0 tte7.jp2) + +add_executable(test_tile_decoder test_tile_decoder.c) +target_link_libraries(test_tile_decoder ${OPENJPEG_LIBRARY_NAME}) + +add_test(NAME ttd0 COMMAND test_tile_decoder) +set_property(TEST ttd0 APPEND PROPERTY DEPENDS tte0) +add_test(NAME ttd1 COMMAND test_tile_decoder 0 0 1024 1024 tte1.j2k) +set_property(TEST ttd1 APPEND PROPERTY DEPENDS tte1) +add_test(NAME ttd2 COMMAND test_tile_decoder 0 0 1024 1024 tte2.jp2) +set_property(TEST ttd2 APPEND PROPERTY DEPENDS tte2) +#add_test(NAME ttd6 COMMAND test_tile_decoder 0 0 512 512 tte6.j2k) +#set_property(TEST ttd6 APPEND PROPERTY DEPENDS tte6) +#add_test(NAME ttd7 COMMAND test_tile_decoder 0 0 512 512 tte7.jp2) +#set_property(TEST ttd7 APPEND PROPERTY DEPENDS tte7) + +add_test(NAME rta1 COMMAND j2k_random_tile_access tte1.j2k) +set_property(TEST rta1 APPEND PROPERTY DEPENDS tte1) +add_test(NAME rta2 COMMAND j2k_random_tile_access tte2.jp2) +set_property(TEST rta2 APPEND PROPERTY DEPENDS tte2) +add_test(NAME rta3 COMMAND j2k_random_tile_access tte3.j2k) +set_property(TEST rta3 APPEND PROPERTY DEPENDS tte3) +add_test(NAME rta4 COMMAND j2k_random_tile_access tte4.j2k) +set_property(TEST rta4 APPEND PROPERTY DEPENDS tte4) +add_test(NAME rta5 COMMAND j2k_random_tile_access tte5.j2k) +set_property(TEST rta5 APPEND PROPERTY DEPENDS tte5) # No image send to the dashboard if lib PNG is not available. -IF(NOT HAVE_LIBPNG) - MESSAGE(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") -ENDIF(NOT HAVE_LIBPNG) - -ADD_SUBDIRECTORY(conformance) -ADD_SUBDIRECTORY(nonregression) - -IF(BUILD_JPIP) - IF(JPIP_SERVER) - #SET(s "http://jpip.example.com/myFCGI?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") - SET(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") - SET(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat") - SET(md5 "62b00c620fb0a600c5ffd413cada4674") - ADD_TEST(TestJPIP1 ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p} +if(NOT OPJ_HAVE_LIBPNG) + message(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") +endif() + +add_subdirectory(conformance) +add_subdirectory(nonregression) +add_subdirectory(unit) + +if(BUILD_JPIP) + if(JPIP_SERVER) + #set(s "http://jpip.example.com/myFCGI?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") + set(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream") + set(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat") + set(md5 "62b00c620fb0a600c5ffd413cada4674") + add_test(NAME TestJPIP1 COMMAND ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p} -DEXPECTED_MD5=${md5} -P ${PROJECT_SOURCE_DIR}/CMake/JPIPTestDriver.cmake) - ENDIF(JPIP_SERVER) -ENDIF(BUILD_JPIP) + endif() +endif()