diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:24 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:24 +0000 |
| commit | 53f15fe0567c380f6542607b8d5bdc01685f9d53 (patch) | |
| tree | 4a1c38c88ea133e24b439c15b633f9152c5a33f5 | |
| parent | try verbose tests (diff) | |
| download | inkscape-53f15fe0567c380f6542607b8d5bdc01685f9d53.tar.gz inkscape-53f15fe0567c380f6542607b8d5bdc01685f9d53.zip | |
fix typo, update CI
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | testfiles/rendering_tests/test.sh | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9e276e5c..5ca127707 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ inkscape:linux: - mkdir -p build/conf - ln -s . share/inkscape - cd build - - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../ - - make -j3 + - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$PWD/install_dir/ + - make -j3 install - make -j3 tests - cd .. artifacts: @@ -84,6 +84,7 @@ test:linux: dependencies: - inkscape:linux script: + - apt-get update -yqq && apt-get install -y imagemagick - cd build - make test - ctest -V diff --git a/testfiles/rendering_tests/test.sh b/testfiles/rendering_tests/test.sh index c77b5ef0f..153f3a5e9 100755 --- a/testfiles/rendering_tests/test.sh +++ b/testfiles/rendering_tests/test.sh @@ -49,7 +49,7 @@ do rm ${test}.png ${test}-compare.png else echo ${test} "FAILED" - exist_status=1 + 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 @@ -59,6 +59,7 @@ do rm ${test}-large.png ${test}-compare-large.png else echo ${test}-large "FAILED" + exit_status=1 fi done rm .tmp |