From 8364908d0a3b922643c2f64bfeed3a26ed3a9552 Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Thu, 27 Sep 2018 15:29:55 -0700 Subject: Disables xgps[speed] -V in python-versions check. Some of the Gtk imports used by xgps and xgpsspeed aren't merely imports, but also actually establish a connection to the X11 server. Not only does this require that a usable X11 server be available (in some cases launching one), but it may also take significant time even when it works. It would be best to fix xgps and xgpsspeed to avoid those imports for options such as -V and -h, but in the meantime it's undesirable to include those programs in the version check. This fix replaces their invocations with a comment. The change that introduced the version checks almost certainly would have failed Bernd's Travis CI checks, if that mechanism hadn't died 166 commits ago. TESTED: Both "scons python-versions" and "scons check" now produce the expected results without launching an X11 server or delaying. --- SConstruct | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 2e5572b9..c606b86f 100644 --- a/SConstruct +++ b/SConstruct @@ -1899,9 +1899,15 @@ if python_progs: # get version from each python prog # this ensures they can run and gps_versions match + # However, xgps[speed] -V requires (possibly launching) a usable X11 server, + # and takes significant time time to connect to it, so we skip checking + # those until that's fixed. vchk = '' for prog in python_progs: - vchk += '$SRCDIR/%s -V\n' % prog + if prog not in ['xgps', 'xgpsspeed']: + vchk += '$SRCDIR/%s -V\n' % prog + else: + vchk += '# %s -V not checked due to X11 dependency\n' % prog python_versions = Utility('python-versions', [python_progs], vchk) else: -- cgit v1.2.1