minor doc tweak

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0a6215c48df106466534b9467067ba0ac4efbcb5..2db27bb6d4832b3c4facfd95f12cc18448a1c05c 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,26 +1,29 @@
-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}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/applications/codec
+  ${OPENJPEG_SOURCE_DIR}/applications/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}/applications/codec/convert.c
+  ${OPENJPEG_SOURCE_DIR}/applications/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}/applications/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}/applications/common/opj_getopt.c)
 
 ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
-TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME}
-                                       ${Z_LIBNAME}
-                                       ${PNG_LIBNAME}
-                                       ${TIFF_LIBNAME}
-                                       )
+TARGET_LINK_LIBRARIES(comparePGXimages
+  ${OPENJPEG_LIBRARY_NAME} ${Z_LIBNAME}
+  ${PNG_LIBNAME} ${TIFF_LIBNAME})
                                        
 ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS})
 

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index ba89ef7c5582ccda529d2a7b45b1dca5c7b0d56b..c5310547cde053f5d20d0d929e36accf2fe14642 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -1,19 +1,21 @@
-# This file list all the input commands of the tests run by the ctest command which \r
-# are not related to the conformance files.\r
+# This file list all the input commands of the tests run by the ctest command\r
+# which are not related to the conformance files.\r
 #\r
-# For each line of this file (exept line which begin with #) an image_to_j2k test or a \r
-# j2k_to_image is run and its related tests.\r
-#   + For encoder related tests = dump, compare dump to base, decode the encoded file with \r
-#     reference and compare the decoded file with the baseline decoded previously with \r
-#     ref decoder.\r
-#   + For decoder related tests = dump, compare dump to base, (TODO: compare outpout decoding \r
-#     image to base)\r
+# For each line of this file (exept line which begin with #) an image_to_j2k\r
+# test or a j2k_to_image is run and its related tests.\r
+#   + For encoder related tests = dump, compare dump to base, decode the\r
+#   encoded file with reference and compare the decoded file with the baseline\r
+#   decoded previously with ref decoder.\r
+#   + For decoder related tests = dump, compare dump to base, (TODO: compare\r
+#   outpout decoding image to base)\r
 #\r
-# Line begin with ! should failed (should be used for bad jpeg2000 file which should be \r
-# gracefully rejected)\r
+# Line begining with ! should fail (use for bad jpeg2000 file which should\r
+# gracefully be rejected)\r
 #\r
-# You can use @INPUT_NR_PATH@ and @TEMP_PATH@ cmake variable which refers to OPJ_DATA_ROOT \r
-# repository. However you can use relative path or absolute path.\r
+# You can use @INPUT_NR_PATH@ and @TEMP_PATH@ cmake variable which refers to\r
+# OPJ_DATA_ROOT repository. You can use either relative path or absolute path.\r
+# However you cannot have space in the path for neither INPUT_NR_PATH nor\r
+# TEMP_PATH\r
 \r
 # ENCODER TEST SUITE\r
 image_to_j2k -i @INPUT_NR_PATH@/Bretagne1.ppm -o @TEMP_PATH@/Bretagne1_0.j2k -r 200,50,10\r