tests: allow out-of-tree builds

Author: MartinPulec

CMakeLists.txt

@@ -231,7 +231,9 @@ add_custom_target(cscope cscope -bv ${ALL_SOURCES})
 add_custom_target(ctags ctags ${ALL_SOURCES})
 add_custom_target(universal-ctags ctags-universal ${ALL_SOURCES})
 
-add_test(NAME unittests COMMAND make -C test/unit LIBDIR=${CMAKE_BINARY_DIR} CPATH=${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/include LIBRARY_PATH=${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/lib64
+add_test(NAME unittests COMMAND make -C test/unit BUILD_DIR=${CMAKE_BINARY_DIR}
+        LIBDIR=${CMAKE_BINARY_DIR} CPATH=${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/include
+        LIBRARY_PATH=${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/lib64
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 add_test(NAME test-colors COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/colors/run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/${GPUJPEG_BIN_OUTPUT_NAME})
 add_test(NAME regression COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test/regression/run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/${GPUJPEG_BIN_OUTPUT_NAME})

colors/test_common.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eu
+#!/bin/bash -euxv
 #
 # Requires FFmpeg (convert), ImageMagick (compare)
 # Parameters
@@ -16,6 +16,7 @@ DIR=`dirname $0`
 GPUJPEG=${1:-$DIR/../gpujpegtool}
 REQUESTED_PSNR=40
 IMAGE=image_bt709_422.yuv
+TMPDIR=.
 #IMAGE=camera_bt709_422.yuv
 
 . "$DIR/../test/common.sh" # for magick_compare
@@ -28,22 +29,27 @@ fi
 # Create an image from source in specified mode ()
 #$GPUJPEG --size=1920x1080 --colorspace=ycbcr-bt709 --pixel-format=422-u8-p1020 \
 #    --convert $MODE $DIR/$IMAGE $DIR/$NAME.$EXTENSION
-ffmpeg -y -f rawvideo -pixel_format uyvy422 -video_size 1920x1080 -i $DIR/$IMAGE -f rawvideo -pix_fmt $FF_FORMAT -video_size 1920x1080 $DIR/$NAME.$EXTENSION
+ffmpeg -y -f rawvideo -pixel_format uyvy422 -video_size 1920x1080 -i $DIR/$IMAGE\
+ -f rawvideo -pix_fmt $FF_FORMAT -video_size 1920x1080 $TMPDIR/$NAME.$EXTENSION
 
 # Encode and Decode the image
 $GPUJPEG --size 1920x1080 $MODE \
-    --encode --quality 100 $DIR/$NAME.$EXTENSION $DIR/$NAME.encoded.jpg
+    --encode --quality 100 $TMPDIR/$NAME.$EXTENSION $TMPDIR/$NAME.encoded.jpg
 $GPUJPEG $MODE \
-    --decode $DIR/$NAME.encoded.jpg $DIR/$NAME.decoded.$EXTENSION
+    --decode $TMPDIR/$NAME.encoded.jpg $TMPDIR/$NAME.decoded.$EXTENSION
 
 # Convert the Original and the Processed Image to RGB444
 #$GPUJPEG --size=1920x1080 $MODE \
 #    --convert --colorspace=rgb $DIR/$NAME.$EXTENSION $DIR/$NAME.rgb
 #$GPUJPEG --size=1920x1080 $MODE \
 #    --convert --colorspace=rgb $DIR/$NAME.decoded.$EXTENSION $DIR/$NAME.decoded.rgb
 if [ $EXTENSION != rgb ]; then
-        ffmpeg -y -f rawvideo -pixel_format $FF_FORMAT -video_size 1920x1080 -i  $DIR/$NAME.$EXTENSION -f rawvideo -pix_fmt rgb24 -video_size 1920x1080 $DIR/$NAME.rgb
-        ffmpeg -y -f rawvideo -pixel_format $FF_FORMAT -video_size 1920x1080 -i  $DIR/$NAME.decoded.$EXTENSION -f rawvideo -pix_fmt rgb24 -video_size 1920x1080 $DIR/$NAME.decoded.rgb
+        ffmpeg -y -f rawvideo -pixel_format $FF_FORMAT -video_size 1920x1080 -i\
+ $TMPDIR/$NAME.$EXTENSION -f rawvideo -pix_fmt rgb24 -video_size 1920x1080\
+ $TMPDIR/$NAME.rgb
+        ffmpeg -y -f rawvideo -pixel_format $FF_FORMAT -video_size 1920x1080 -i\
+ $TMPDIR/$NAME.decoded.$EXTENSION -f rawvideo -pix_fmt rgb24 -video_size 1920x1080\
+ $TMPDIR/$NAME.decoded.rgb
 fi
 
 # Display Left/Right Diff of the Original and the Processed Image
@@ -54,5 +60,6 @@ if ! magick_compare "$DIR/$NAME.rgb" "$DIR/$NAME.decoded.rgb" \
 fi
 
 # Delete Created Files
-rm -f $DIR/$NAME.$EXTENSION $DIR/$NAME.rgb $DIR/$NAME.encoded.jpg $DIR/$NAME.decoded.$EXTENSION $DIR/$NAME.decoded.rgb
+rm -f $TMPDIR/$NAME.$EXTENSION $TMPDIR/$NAME.rgb $TMPDIR/$NAME.encoded.jpg\
+ $TMPDIR/$NAME.decoded.$EXTENSION $TMPDIR/$NAME.decoded.rgb
 

test/unit/Makefile

@@ -1,8 +1,9 @@
+BUILD_DIR ?= .
 LIBDIR ?= ../../build
 
 all: run_tests
-	LD_LIBRARY_PATH=$(LIBDIR) ./$<
+	LD_LIBRARY_PATH=$(LIBDIR) $(BUILD_DIR)/$<
 
 run_tests: $(wildcard *.c)
-	$(CC) -g -I../.. $^ -L$(LIBDIR) -lgpujpeg -lcudart -o $@
+	$(CC) -g -I../.. $^ -L$(LIBDIR) -lgpujpeg -lcudart -o $(BUILD_DIR)/$@