build: add test build

.travis.yml

@@ -10,46 +10,18 @@ matrix:
   #          - env: "JOB=Android_armv7"
             - env: "JOB=MacOSX"
   include:
-    # 1st parallel build job - debug build on Ubuntu
-    # - env: "JOB=Tests"
-    #   addons:
-    #     apt:
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #       packages:
-    #         - g++-4.9
-    #         # not white listed - alsa
-    #         - libsndfile1
-    #         - wget
-    #         - make
-    #         - ant
-    #         - curl
-    #         - libasound2-dev
-    #         - portaudio19-dev
-    #         - libsndfile1-dev
-    #         - zlib1g-dev
-    #         - libfreetype6-dev
-    #         - libfontconfig1-dev
-    #         - lame
-    #         - libmp3lame-dev
-    #         - libegl1-mesa-dev
-    #         - libegl1-mesa
-    #         - ccache
-    #         - libpulse-dev
-    #   cache:
-    #     directories:
-    #       - $HOME/.ccache
-    #   before_install:
-    #     - "source build/travis/job1_Tests/environment.sh"
-    #   install:
-    #     - "./build/travis/job1_Tests/install.sh"
-    #   before_script:
-    #     - "./build/travis/job1_Tests/before_script.sh"
-    #   script:
-    #     - "./build/travis/job1_Tests/run_tests.sh"
-    #   after_script:
-    #     - ARTIFACTS_CACHE_CONTROL='public, max-age=315360000'
-    #     - 'ARTIFACTS_PATHS="$(ls vtest/html | tr "\n" ":")" artifacts upload'
+    # 1st parallel build job - debug build and tests
+    - env: "JOB=Test_x64"
+      addons:
+        apt:
+          packages:
+          - bsdtar
+          - curl
+          # - zsync
+      services:
+        - docker
+      script:
+        - "./build/travis/job1_Test/build.sh --x86_64"
 
     # 2nd parallel build job - portable Linux AppImage 64-bit x86 build on CentOS
     - env: "JOB=AppImage_x64"

apps/MachinekitClient/main.qml

@@ -102,5 +102,10 @@ Item {
         {
             connectionWindow.configurationFilePath = argument;
         }
+        else if (option === '--test-deployment') {
+            if (argument === 'true') {
+                Qt.quit();
+            }
+        }
     }
 }

build/Linux/android/Recipe

@@ -1,4 +1,4 @@
-!/usr/bin/env bash
+#!/usr/bin/env bash
 
 # Build a portable AppImage starting from a clean system. Other examples at:
 # https://github.com/probonopd/AppImages/blob/master/recipes/scribus/Recipe
@@ -37,29 +37,24 @@ fi
 ##########################################################################
 # BUILD QTQUICKVCP
 ##########################################################################
-export PATH="${PWD}/qt5/bin:$PATH"
-export LD_LIBRARY_PATH="${PWD}/qt5/lib:$LD_LIBRARY_PATH"
-export QT_PLUGIN_PATH="${PWD}/qt5/plugins"
-export QML_IMPORT_PATH="${PWD}/qt5/qml"
-export QML2_IMPORT_PATH="${PWD}/qt5/qml"
-export QT_QPA_PLATFORM_PLUGIN_PATH="${PWD}/qt5/plugins/platforms"
-export QT_INSTALL_PREFIX="${PWD}/qt5"
-
-export ANDROID_NDK_ROOT="${PWD}/android-ndk"
-export ANDROID_SDK_ROOT="${PWD}/android-sdk"
-export ANDROID_HOME="${PWD}/android-sdk"
-
-# If not building on Travis then might need to fetch QtQuickVcp
-[ -d "QtQuickVcp" ] || git clone --depth 1 https://github.com/qtquickvcp/QtQuickVcp.git
-
-cd QtQuickVcp
+export PATH="/qt5/bin:$PATH"
+export LD_LIBRARY_PATH="/qt5/lib:$LD_LIBRARY_PATH"
+export QT_PLUGIN_PATH="/qt5/plugins"
+export QML_IMPORT_PATH="/qt5/qml"
+export QML2_IMPORT_PATH="/qt5/qml"
+export QT_QPA_PLATFORM_PLUGIN_PATH="/qt5/plugins/platforms"
+export QT_INSTALL_PREFIX="/qt5"
+
+export ANDROID_NDK_ROOT="/android-ndk"
+export ANDROID_SDK_ROOT="/android-sdk"
+export ANDROID_HOME="/android-sdk"
 
 mkdir -p build.release
 cd build.release
 
 # build QtQuickVcp
 qmake -r ..
-make
+make -j$((`nproc` + 1))
 make -C 3rdparty install
 make -C src install
 make INSTALL_ROOT=android-build install

build/Linux/portable/Recipe

@@ -23,7 +23,7 @@ set -x # Be verbose
 if [ "$(grep "Debian GNU/Linux 9 (stretch)" /etc/*release*)" ]; then
   OS="Debian Stretch"
 else
-  echo "${0}: Warning: Not running on Debian Jessie!" >&2
+  echo "${0}: Warning: Not running on Debian Stretch!" >&2
 fi
 
 ##########################################################################
@@ -37,26 +37,21 @@ fi
 ##########################################################################
 # BUILD QTQUICKVCP
 ##########################################################################
-export PATH="${PWD}/qt5/bin:$PATH"
-export LD_LIBRARY_PATH="${PWD}/qt5/lib:$LD_LIBRARY_PATH"
-export QT_PLUGIN_PATH="${PWD}/qt5/plugins"
-export QML_IMPORT_PATH="${PWD}/qt5/qml"
-export QML2_IMPORT_PATH="${PWD}/qt5/qml"
-export QT_QPA_PLATFORM_PLUGIN_PATH="${PWD}/qt5/plugins/platforms"
-export QT_INSTALL_PREFIX="${PWD}/qt5"
-
-# If not building on Travis then might need to fetch QtQuickVcp
-[ -d "QtQuickVcp" ] || git clone --depth 1 https://github.com/qtquickvcp/QtQuickVcp.git
-
-cd QtQuickVcp
+export PATH="/qt5/bin:$PATH"
+export LD_LIBRARY_PATH="/qt5/lib:$LD_LIBRARY_PATH"
+export QT_PLUGIN_PATH="/qt5/plugins"
+export QML_IMPORT_PATH="/qt5/qml"
+export QML2_IMPORT_PATH="/qt5/qml"
+export QT_QPA_PLATFORM_PLUGIN_PATH="/qt5/plugins/platforms"
+export QT_INSTALL_PREFIX="/qt5"
 
 mkdir -p build.release
 cd build.release
 
 qmake -r ..
-make
+make -j$((`nproc` + 1))
 # make docs
-make install
+sudo make install
 # make install_docs
 
 # compress QtQuick module
@@ -88,13 +83,16 @@ appdir=${PWD}/MachinekitClient.AppDir/
 appimage=${PWD}/MachinekitClient.AppImage
 
 # back to home folder
-cd ../../
+cd ../
+
+# cleanup plugins.qmltypes files here, since they have been created with sudo
+sudo chown -R `whoami` ./build.release
 
 ##########################################################################
 # PACKAGE INTO APPIMAGE WITH APPIMAGEKIT
 ##########################################################################
 
-cd AppImageKit/AppImageAssistant.AppDir
+cd /AppImageKit/AppImageAssistant.AppDir
 ./package  "$appdir" "$appimage"
 
 # allow access to AppImage from outside the chroot

build/Linux/test/Recipe

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# Run tests in a clean environment
+
+# NOTES:
+#
+# 1) IT IS NOT SAFE TO RUN THIS RECIPE ON A PERSISTENT FILESYSTEM! Use either:
+#      * A chroot into a Live ISO, squashfs or Docker Image.
+#      * Or, a virtual machine on a dedicated build server (e.g. Travis CI)
+#    DO NOT RUN THE RECIPE ON A NORMAL COMPUTER OUTSIDE OF A TEMPORARY CHROOT!
+#
+
+set -e # Halt on errors
+set -x # Be verbose
+
+##########################################################################
+# CHECK SYSTEM
+##########################################################################
+
+if [ "$(grep "Debian GNU/Linux 9 (stretch)" /etc/*release*)" ]; then
+  OS="Debian Stretch"
+else
+  echo "${0}: Error: Not running on Debian Stretch!" >&2
+  exit 1
+fi
+
+##########################################################################
+# BUILD APPLICATION
+##########################################################################
+export PATH="/qt5/bin:$PATH"
+export LD_LIBRARY_PATH="/qt5/lib:$LD_LIBRARY_PATH"
+export QT_PLUGIN_PATH="/qt5/plugins"
+export QML_IMPORT_PATH="/qt5/qml"
+export QML2_IMPORT_PATH="/qt5/qml"
+export QT_QPA_PLATFORM_PLUGIN_PATH="/qt5/plugins/platforms"
+export QT_INSTALL_PREFIX="/qt5"
+
+# build and run unit tests
+mkdir -p build.debug
+cd build.debug
+qmake -r CONFIG+=debug ..
+make -j$((`nproc` + 1))
+sudo make install
+
+cd tests
+
+#export QT_DEBUG_PLUGINS=1
+# run all tests
+for D in *; do
+    if [ -d "${D}" ]; then
+        cd $D
+        xvfb-run --server-args "-screen 0 1920x1080x24" ./$D
+        cd ..
+    fi
+done
+
+cd ..
+
+# build and run MachinekitClient
+# to see if deployment works
+cd apps/MachinekitClient
+
+xvfb-run --server-args "-screen 0 1920x1080x24" ./machinekit-client --test-deployment true
+
+# back to home folder
+cd ../../

build/travis/job1_Test/build.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+# Run this script from QtQuickVcp's root directory
+
+# QtQuickVcp Test build
+
+set -e # exit on error
+set -x # echo commands
+
+# Run tests depending on arch specified in $1 if cross-compiling, else default build x86_64
+case "$1" in
+  * )
+    [ "$1" == "--x86_64" ] && shift || true
+    # Build QtQuickVcp AppImage inside native (64-bit x86) Docker image
+    docker run -i -v "${PWD}:/QtQuickVcp" machinekoder/qtquickvcp-docker-linux-x64:latest \
+           /bin/bash -c "cd QtQuickVcp; ./build/Linux/test/Recipe"
+    platform="x64"
+    ;;
+esac

build/travis/job2_AppImage/build.sh

@@ -61,7 +61,7 @@ case "$1" in
     [ "$1" == "--x86_64" ] && shift || true
     # Build QtQuickVcp AppImage inside native (64-bit x86) Docker image
     docker run -i -v "${PWD}:/QtQuickVcp" machinekoder/qtquickvcp-docker-linux-x64:latest \
-           /bin/bash -c "/QtQuickVcp/build/Linux/portable/Recipe"
+           /bin/bash -c "cd QtQuickVcp; ./build/Linux/portable/Recipe"
     platform="x64"
     ;;
 esac

tests/halremotetests/halremotetests.pro

@@ -8,7 +8,7 @@ QT       += network testlib
 
 QT       -= gui
 
-TARGET = tst_halpintest
+TARGET = halremotetests
 CONFIG += console
 CONFIG -= app_bundle
 CONFIG += c++14

tests/qmltests/qmltests.pro

@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qml
+TARGET = qmltests
 CONFIG += warn_on qmltestcase
 CONFIG -= app_bundle
 SOURCES += tst_qml.cpp