on xenial help sign in
Fix copyright tests
commitcda847ac84a1fb60399e1be2e80859e1b8743d9f authorDalton Durst <d@ltondur.st> dateThu 11 Apr 2019, 16:34 (8 years ago) parent93c159a
2 files changed+2−18
plugins/Wizard/test.sh−18 tests/copyright/check_copyright.sh+2
plugins/Wizard/test.shdeleted−18
@@ -1,18 +0,0 @@
1−#!/bin/sh
2−
3−TOPDIR=$(readlink -e "$(dirname ${0})/..")
4−
5−LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)
6−if [ -n ${LOCAL_PRIVATE_DIR} ]; then
7− echo "Testing against locally built version"
8− export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/debian/tmp/usr/share"
9− export UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES="${LOCAL_PRIVATE_DIR}"
10− export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}
11− export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}
12−else
13− echo "Testing against system version"
14−fi
15−
16−export QML2_IMPORT_PATH=${TOPDIR}/tests/mocks:${QML2_IMPORT_PATH}
17−
18−exec system-settings-wizard
tests/copyright/check_copyright.sh+2
@@ -63,6 +63,8 @@ ignore_pat="$ignore_pat|/Wizard/licenses/.*\\.html$"
6363ignore_pat="$ignore_pat|\\.qrc$"
6464# the doc devices.conf file
6565ignore_pat="$ignore_pat|/doc/devices\\.conf$"
66+# Jenkins configuration
67+ignore_pat="$ignore_pat|/Jenkinsfile"
6668
6769#
6870# We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories