summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan FitiƩ <jfitie@gmail.com>2017-07-19 19:27:09 +0200
committerJohan FitiƩ <jfitie@gmail.com>2017-07-19 19:27:09 +0200
commit10e4c6d58be588d61f54bd2f7e6b611e49e0a303 (patch)
tree69cf8a603228cb79d8e7af4644a49ac87bb7e146
parentc87798b495346b22cbb710dfe19eb12f514d8480 (diff)
downloadnavit-10e4c6d58be588d61f54bd2f7e6b611e49e0a303.tar.gz
Landscape and portrait display sizes
-rw-r--r--ci/run_linux_tests.sh45
1 files changed, 28 insertions, 17 deletions
diff --git a/ci/run_linux_tests.sh b/ci/run_linux_tests.sh
index 8e5e9877c..79eedec31 100644
--- a/ci/run_linux_tests.sh
+++ b/ci/run_linux_tests.sh
@@ -66,23 +66,34 @@ linux_test qt5_qml
# Test different pitches and resolutions
i=0 # index
-for p in 0 1 2 5 10 15 25 45; # pitch
+for l in 0 1; # landscape (0), portrait (1)
do
- for x in 800 1024 1280 1366 1920 2560; # x resolution
+ for p in 0 1 2 5 10 15 25 45; # pitch
do
- for y in 600 768 800 1024 1080 1440; # y resolution
+ for x in 800 1024 1280 1366 1920 2560; # x resolution
do
- i=$((i++)) # 8*6*6=288 test vectors
- # restore config
- cp navit.xml.bak navit.xml
- # run gtk test
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml
- sed -i -e 's@name="Demo" profilename="car" enabled="no" @name="Demo" profilename="car" enabled="yes" follow="1" refresh="1"@' navit.xml
- sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml
- sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml
- 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="'$x'" h="'$y'"@' navit.xml # set resolution
- linux_test gtk_drawing_area_"$i"_"$x"_"$y"_"$p"
- done # y
- done # x
-done # p
+ for y in 600 768 800 1024 1080 1440; # y resolution
+ do
+ i=$((i++)) # 2*8*6*6=576 test vectors
+ # restore config
+ cp navit.xml.bak navit.xml
+ # run gtk test
+ sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml
+ sed -i -e 's@name="Demo" profilename="car" enabled="no" @name="Demo" profilename="car" enabled="yes" follow="1" refresh="1"@' navit.xml
+ sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml
+ sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml
+ if [ $l -eq 0 ]
+ then # landscape
+ rx=$x
+ ry=$y
+ else # portrait
+ rx=$y
+ ry=$x
+ fi
+ 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"
+ done # y
+ done # x
+ done # p
+done # l