Simplify

1 files changed, 7 insertions, 3 deletions

diff --git a/ci/run_linux_tests.sh b/ci/run_linux_tests.sh
index 4311696b1..f6243d3c9 100644
--- a/ci/run_linux_tests.sh
+++ b/ci/run_linux_tests.sh
@@ -65,14 +65,14 @@ sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@'
 linux_test qt5_qml
 
 # Test different pitches and resolutions
-i=0 # index
+mkdir $CIRCLE_ARTIFACTS/testpitch
 for l in 0 1; # portrait (0), landscape (1)
 do
  for x in 320 800 854 1280 1920 2560 3840; # x resolution
  do
   for y in 240 400 480 720 1080 1440 1600 2160; # y resolution
   do
-   i=$((i++)) # 2*7*8=112 test vectors
+   # 2*7*8=112 test vectors
    # restore config
    cp navit.xml.bak navit.xml
    # run gtk test
@@ -91,7 +91,11 @@ do
    p=`python -c 'import math;print int(round(20*math.sqrt(320*240)/math.sqrt('$x'*'$y'),0))'` # pitch // ROUND(20*SQRT(320*240)/SQRT(x*y))
    sed -i -e 's@navit center="11.5666 48.1333"@navit center="11.5666 48.1333" pitch="'$p'"@' navit.xml # set pitch
    sed -i -e 's@graphics type="gtk_drawing_area"@graphics type="gtk_drawing_area" w="'$rx'" h="'$ry'"@' navit.xml # set resolution
-   linux_test gtk_drawing_area_"$i"_"$rx"_"$ry"_"$p"
+   ./navit &
+   pid=$!
+   sleep 5
+   import -window root $CIRCLE_ARTIFACTS/testpitch/"$rx"_"$ry"_"$p".png
+   kill $pid
   done # y
  done # x
 done # l