Move test scripts into test/

CMakeLists.txt

@@ -1874,27 +1874,27 @@ endforeach()
 add_custom_target(testclean COMMAND ${CMAKE_COMMAND} -P
   ${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/testclean.cmake)
 
-configure_file(croptest.in croptest @ONLY)
+configure_file(test/croptest.in test/croptest @ONLY)
 add_custom_target(croptest
   COMMAND echo croptest
-  COMMAND ${BASH} ${CMAKE_CURRENT_BINARY_DIR}/croptest)
+  COMMAND ${BASH} ${CMAKE_CURRENT_BINARY_DIR}/test/croptest)
 
 if(WITH_TURBOJPEG)
-  configure_file(tjbenchtest.in tjbenchtest @ONLY)
-  configure_file(tjexampletest.in tjexampletest @ONLY)
+  configure_file(test/tjbenchtest.in test/tjbenchtest @ONLY)
+  configure_file(test/tjexampletest.in test/tjexampletest @ONLY)
   if(WIN32)
     set(BASH bash)
   endif()
   add_custom_target(tjtest COMMAND ${CMAKE_COMMAND} -DWITH_JAVA=${WITH_JAVA}
     -DPRECISION=8 -P ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
     DEPENDS ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
-      ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest
-      ${CMAKE_CURRENT_BINARY_DIR}/tjexampletest)
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjbenchtest
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjexampletest)
   add_custom_target(tjtest12 COMMAND ${CMAKE_COMMAND} -DWITH_JAVA=${WITH_JAVA}
     -DPRECISION=12 -P ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
     DEPENDS ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
-      ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest
-      ${CMAKE_CURRENT_BINARY_DIR}/tjexampletest)
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjbenchtest
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjexampletest)
   add_custom_target(tjtest16 COMMAND ${CMAKE_COMMAND} -DWITH_JAVA=${WITH_JAVA}
     -DPRECISION=2 -P ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
     COMMAND ${CMAKE_COMMAND} -DWITH_JAVA=${WITH_JAVA}
@@ -1922,8 +1922,8 @@ if(WITH_TURBOJPEG)
     COMMAND ${CMAKE_COMMAND} -DWITH_JAVA=${WITH_JAVA}
     -DPRECISION=16 -P ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
     DEPENDS ${CMAKE_SOURCE_DIR}/cmakescripts/tjbenchtest.cmake
-      ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest
-      ${CMAKE_CURRENT_BINARY_DIR}/tjexampletest)
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjbenchtest
+      ${CMAKE_CURRENT_BINARY_DIR}/test/tjexampletest)
 endif()
 
 

ChangeLog.md

@@ -6,8 +6,9 @@
 1. The libjpeg-turbo source tree has been reorganized to make it easier to find
 the README files, license information, and build instructions.  The
 documentation for the libjpeg API library and associated programs has been
-moved into the **doc/** subdirectory, and all C source code and headers have
-been moved into a new **src/** subdirectory.
+moved into the **doc/** subdirectory, all C source code and headers have been
+moved into a new **src/** subdirectory, and test scripts have been moved into a
+new **test/** subdirectory.
 
 2. Added a new TJBench option (`-gray`) that can be used to test the
 performance of compressing/decompressing a grayscale JPEG image from/to a

cmakescripts/tjbenchtest.cmake

@@ -15,7 +15,7 @@ endmacro()
 macro(run_test PROG ARGS)
   string(REPLACE ";" " " SPACED_ARGS "${ARGS}")
   message(STATUS "${PROG} ${SPACED_ARGS}")
-  execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${PROG} ${ARGS}
+  execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test/${PROG} ${ARGS}
     RESULT_VARIABLE RESULT)
   check_error("${PROG} ${SPACED_ARGS}")
 endmacro()

test/croptest.in

@@ -22,9 +22,9 @@ runme()
 IMAGE=vgl_6548_0026a.bmp
 WIDTH=128
 HEIGHT=95
-IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
 OUTDIR=`mktemp -d /tmp/__croptest_output.XXXXXX`
-EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
+EXEDIR=@CMAKE_BINARY_DIR@
 
 if [ -d $OUTDIR ]; then
 	rm -rf $OUTDIR

test/tjbenchtest.in

@@ -21,9 +21,9 @@ runme()
 
 EXT=bmp
 IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} big_tree8.${EXT}"
-IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
 OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX`
-EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
+EXEDIR=@CMAKE_BINARY_DIR@
 JAVA="@Java_JAVA_EXECUTABLE@"
 JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
 TJBENCH=$EXEDIR/tjbench

test/tjexampletest.in

@@ -20,9 +20,9 @@ runme()
 }
 
 IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp big_tree8.bmp"
-IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
 OUTDIR=`mktemp -d /tmp/__tjexampletest_output.XXXXXX`
-EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
+EXEDIR=@CMAKE_BINARY_DIR@
 JAVA="@Java_JAVA_EXECUTABLE@"
 JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
 TJEXAMPLE=$EXEDIR/tjexample