X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tests%2FCMakeLists.txt;h=a34963f9c0f6613a52fbeac3c7b33d32634d1935;hb=d518970039a19a2a9b6d2bdd592cc88a43897bbb;hp=003f2f17536c065c98eaebba5c23a9a44cdce5f8;hpb=06363c01e4beb4e5a046554ebbcf774dfa45bfb5;p=openjpeg.git

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 003f2f17..a34963f9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,35 +1,80 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg
-                    ${OPENJPEG_SOURCE_DIR}/applications/codec
-                    ${OPENJPEG_SOURCE_DIR}/applications/common
-                    ${Z_INCLUDE_DIRNAME}
-                    ${PNG_INCLUDE_DIRNAME}
-                    ${TIFF_INCLUDE_DIRNAME}
-                    )
+# Tests
+include_directories(
+  ${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)
-
-# If not getopt was found then add it to the exe:
-IF(DONT_HAVE_GETOPT)
-  message("dont have getopt, we will add it")
-  SET(comparePGXimages_SRCS
-    ${comparePGXimages_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c
+set(comparePGXimages_SRCS comparePGXimages.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
   )
-ENDIF(DONT_HAVE_GETOPT)
 
-ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
-TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME}
-                                       ${Z_LIBNAME}
-                                       ${PNG_LIBNAME}
-                                       ${TIFF_LIBNAME}
-                                       )
+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}/src/bin/common/opj_getopt.c)
+
+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()
+
+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(compareRAWimages ${compareRAWimages_SRCS})
+
+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(tte0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder)
+add_test(tte1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte1.j2k)
+add_test(tte2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024 8 1 tte2.jp2)
+add_test(tte3 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 2048 2048 1024 1024 8 1 tte3.j2k)
+add_test(tte4 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1  256  256  128  128 8 0 tte4.j2k)
+add_test(tte5 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1  512  512  256  256 8 0 tte5.j2k)
+
+add_executable(test_tile_decoder test_tile_decoder.c)
+target_link_libraries(test_tile_decoder ${OPENJPEG_LIBRARY_NAME})
+
+add_test(ttd0 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder)
+set_property(TEST ttd0 APPEND PROPERTY DEPENDS tte0)
+add_test(ttd1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte1.j2k)
+set_property(TEST ttd1 APPEND PROPERTY DEPENDS tte1)
+add_test(ttd2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte2.jp2)
+set_property(TEST ttd2 APPEND PROPERTY DEPENDS tte2)
 
 # 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)
+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()
+
+add_subdirectory(conformance)
+add_subdirectory(nonregression)
 
-ADD_SUBDIRECTORY(conformance)
+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}
+      -DEXPECTED_MD5=${md5} -P ${PROJECT_SOURCE_DIR}/CMake/JPIPTestDriver.cmake)
+  endif()
+endif()