diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-29 17:46:14 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-29 17:46:14 +0000 |
| commit | 5be4e6e8e707941627f238b91728b9693b66cd81 (patch) | |
| tree | 928e8c7baed17a0a2b2d39891461ee658f14b37f /testfiles/rendering_tests | |
| parent | Small fix (diff) | |
| download | inkscape-5be4e6e8e707941627f238b91728b9693b66cd81.tar.gz inkscape-5be4e6e8e707941627f238b91728b9693b66cd81.zip | |
Fix for out of source tests
Diffstat (limited to 'testfiles/rendering_tests')
| -rw-r--r-- | testfiles/rendering_tests/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | testfiles/rendering_tests/test.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/testfiles/rendering_tests/CMakeLists.txt b/testfiles/rendering_tests/CMakeLists.txt index 7013aefdb..3f838628a 100644 --- a/testfiles/rendering_tests/CMakeLists.txt +++ b/testfiles/rendering_tests/CMakeLists.txt @@ -6,7 +6,7 @@ set(RENDERING_TESTS foreach(rendering_test ${RENDERING_TESTS}) - add_test(NAME ${rendering_test} COMMAND sh ${CMAKE_SOURCE_DIR}/testfiles/rendering_tests/test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/inkscape ${rendering_test} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/testfiles/rendering_tests ) + add_test(NAME ${rendering_test} COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/inkscape ${CMAKE_CURRENT_SOURCE_DIR}/${rendering_test} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/testfiles/rendering_tests ) set_tests_properties(${rendering_test} PROPERTIES ENVIRONMENT ${CMAKE_CTEST_ENV}) endforeach() diff --git a/testfiles/rendering_tests/test.sh b/testfiles/rendering_tests/test.sh index 2a8adf42c..8184a894a 100755 --- a/testfiles/rendering_tests/test.sh +++ b/testfiles/rendering_tests/test.sh @@ -10,9 +10,11 @@ command -v compare >/dev/null 2>&1 || { echo >&2 "I require ImageMagick's 'compa INKSCAPE_EXE=$1 exit_status=0 test=$2 +EXPECTED=$(dirname $test)"/expected_rendering/"$(basename $test) + ${INKSCAPE_EXE} -z ${test}.svg -d 96 -e ${test}.png #2>/dev/null >/dev/null - compare -metric AE ${test}.png expected_rendering/${test}.png ${test}-compare.png 2> .tmp + compare -metric AE ${test}.png ${EXPECTED}.png ${test}-compare.png 2> .tmp test1=`cat .tmp` echo $test1 if [ $test1 == 0 ]; then @@ -23,7 +25,7 @@ test=$2 exit_status=1 fi ${INKSCAPE_EXE} -z ${test}.svg -d 384 -e ${test}-large.png #2>/dev/null >/dev/null - compare -metric AE ${test}-large.png expected_rendering/${test}-large.png ${test}-compare-large.png 2>.tmp + compare -metric AE ${test}-large.png ${EXPECTED}-large.png ${test}-compare-large.png 2>.tmp test2=`cat .tmp` if [ $test2 == 0 ]; then echo ${test}-large "PASSED" |