Fix:CI:Improved linux tests (#196)R7181

* Moving linux tests to a script

CircleCI parallelism does not guarantee that tests will run reliably
on the same containers. This is causing issues for the linux tests,
previously defined in the post section, that need to run on the same
container as the linux build.

* Fixed linux tests scripts path

* Specifies full path to the linux test script

* Bumping zlib to 1.2.9 for tomtom builds

5 files changed, 29 insertions, 23 deletions

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 3fb730dca..3716f47d9 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -34,3 +34,7 @@ fi
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
 	cp -r navit/xpm $CIRCLE_ARTIFACTS
 fi
+
+
+# Done with the builds tests. Running some app tests 
+bash ~/navit/ci/run_linux_tests.sh
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index a931ece4c..3c8a65030 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -41,7 +41,7 @@ if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.
 fi
 
 if ! test -f "~/tomtom_assets/libpng-1.6.27.tar.gz"
- then 
+then 
   wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.27.tar.gz -P ~/tomtom_assets
 fi
 
@@ -53,9 +53,9 @@ tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz
 
 # zlib
 cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.8.tar.gz
-tar xzf zlib-1.2.8.tar.gz
-cd zlib-1.2.8
+wget -nv -c http://zlib.net/zlib-1.2.9.tar.gz
+tar xzf zlib-1.2.9.tar.gz
+cd zlib-1.2.9
 ./configure --prefix=$PREFIX
 make -j$JOBS
 make install
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 01710a0ab..a8820f3a2 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -177,9 +177,9 @@ arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o espeakd
 
 # zlib
 cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.8.tar.gz
-tar xzf zlib-1.2.8.tar.gz
-cd zlib-1.2.8
+wget -nv -c http://zlib.net/zlib-1.2.9.tar.gz
+tar xzf zlib-1.2.9.tar.gz
+cd zlib-1.2.9
 ./configure --prefix=$PREFIX
 make -j$JOBS
 make install
diff --git a/ci/run_linux_tests.sh b/ci/run_linux_tests.sh
new file mode 100644
index 000000000..c34ea0bfb
--- /dev/null
+++ b/ci/run_linux_tests.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+pushd ~/linux-bin/navit/
+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" active="yes"@name="Demo" profilename="car" enabled="yes" active="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
+
+./navit &
+pid=$!
+
+import -window root $CIRCLE_ARTIFACTS/default.png
+
+python ~/navit/ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
+
+dbus-send  --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
diff --git a/circle.yml b/circle.yml
index 9ff4ee7a9..4b296a25c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,22 +30,6 @@ test:
         parallel: true
         files:
           - ci/build_*.sh
-  post:
-    - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
-        pwd: ~/linux-bin/navit/
-    - sed -i -e 's@name="Demo" profilename="car" enabled="no" active="yes"@name="Demo" profilename="car" enabled="yes" active="yes" follow="1" refresh="1"@' navit.xml:
-        pwd: ~/linux-bin/navit/
-    - sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml:
-        pwd: ~/linux-bin/navit/
-    - sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml:
-        pwd: ~/linux-bin/navit/
-    - ./navit:
-        pwd: ~/linux-bin/navit/
-        background: true
-    - sleep 5
-    - import -window root $CIRCLE_ARTIFACTS/default.png
-    - python ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
-    - dbus-send  --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
 deployment:
   merge_into_master:
     branch: trunk