From a7dadaba753e16f7c530aa5c9dd6358008d5ea30 Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Thu, 27 Sep 2018 16:22:09 -0700 Subject: Includes xgps deps test in test list. This adds test-xgps-deps to the test-nondaemon list (and hence to the overall 'check' list). Since the Travis setup doesn't include the necessary prerequisites, it forces xgps=no for Travis. At the time this code was originally tested, Travis was still working. TESTED: Verified that the test is run, and that the test series fails iff one of the dependencies is broken. --- .travis/build.sh | 1 + SConstruct | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis/build.sh b/.travis/build.sh index 40b672f2..b34f6fae 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -18,6 +18,7 @@ SCONSOPTS="${SCONSOPTS} gpsd_user=gpsd" SCONSOPTS="${SCONSOPTS} gpsd_group=dialout" SCONSOPTS="${SCONSOPTS} debug=yes" ### SCONSOPTS="${SCONSOPTS} qt=yes" # The default qt=yes must be overridable +SCONSOPTS="${SCONSOPTS} xgps=no" # Until we figure out the right Gtk3 packages if dpkg -s qtbase5-dev 1>/dev/null 2>&1; then SCONSOPTS="${SCONSOPTS} qt_versioned=5" diff --git a/SConstruct b/SConstruct index 034f8957..7293b155 100644 --- a/SConstruct +++ b/SConstruct @@ -2223,6 +2223,7 @@ test_nondaemon = [ python_compilation_regress, python_versions, rtcm_regress, + test_xgps_deps, time_regress, timespec_regress, unpack_regress, -- cgit v1.2.1