summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Wright <fw@fwright.net>2018-09-27 16:22:09 -0700
committerFred Wright <fw@fwright.net>2018-09-27 16:22:09 -0700
commita7dadaba753e16f7c530aa5c9dd6358008d5ea30 (patch)
tree743ed76a6631f859eddedac050ece734aebe6355
parent661f9ab1f56c8c365018e06e48bb3126809e89c7 (diff)
downloadgpsd-a7dadaba753e16f7c530aa5c9dd6358008d5ea30.tar.gz
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.
-rw-r--r--.travis/build.sh1
-rw-r--r--SConstruct1
2 files changed, 2 insertions, 0 deletions
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,