[gpsd-dev] [PATCH 1/2] Adds 'test-nondaemon' and 'test-noclean' targets.

[Fred Wright]

The 'test-nondaemon' target provides a convenient way to run all but
the really time-consuming tests, also without removing the tests via
'testclean'.

The 'test-noclean' target runs all tests, but doesn't run 'testclean'.

Skipping 'testclean' not only avoids gratuitous rebuilds when running
tests multiple times, but also works properly when parallelized.
Note, however, that the value of parallelizing 'test-noclean' is
currently limited by the serialization of the daemon tests.

TESTED:
Verified that old and new test targets work as expected, as well as
the default build.
---
 SConstruct | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 202401a..e700a5d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1725,13 +1725,13 @@ describe = Utility('describe', [],
                    ['@echo "Run normal regression tests for %s..."' % 
(rev.strip(),)])
 testclean = Utility('testclean', [],
                     'rm -f test_bits test_geoid test_json test_libgps 
test_matrix test_mktime test_packet')
-check = env.Alias('check', [
+
+test_nondaemon = [
     describe,
     python_compilation_regress,
     method_regress,
     bits_regress,
     matrix_regress,
-    gps_regress,
     rtcm_regress,
     aivdm_regress,
     packet_regress,
@@ -1740,11 +1740,15 @@ check = env.Alias('check', [
     time_regress,
     unpack_regress,
     json_regress,
-    testclean,
     test_timespec,
     timespec_regress,
-    ])
+    ]
+
+test_noclean = test_nondaemon + [gps_regress]
 
+env.Alias('test-nondaemon', test_nondaemon)
+env.Alias('test-noclean', test_noclean)
+check = env.Alias('check', test_noclean + [testclean])
 env.Alias('testregress', check)
 
 # Remove all shared-memory segments.  Normally only needs to be run
-- 
2.7.1