diff options
| author | Michael Tatarinov <kukabu@gmail.com> | 2013-11-12 10:08:13 +0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-11-12 01:10:36 -0500 |
| commit | ba1947dc685dcdd4b9e9020c3dbd68a254a14796 (patch) | |
| tree | b1957b03e9e594ae139055cdba779edcc93545c2 | |
| parent | 795b233b94ea4356b3623504f19337d39b7a051b (diff) | |
| download | gpsd-ba1947dc685dcdd4b9e9020c3dbd68a254a14796.tar.gz | |
Cleanup.
Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | test_bits.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -1164,7 +1164,7 @@ env.Command(target="ais_json.i", source="jsongen.py", action='''\ # generate revision.h if 'dev' in gpsd_version: - (st, rev) = _getstatusoutput('git describe') + (st, rev) = _getstatusoutput('git describe --tags') if st != 0: from datetime import datetime rev = datetime.now().isoformat()[:-4] @@ -1634,7 +1634,7 @@ flocktest = Utility("flocktest", [], "cd devtools; ./flocktest " + gitrepo) # Run all normal regression tests describe = Utility('describe', [], - '@if [ -d .git ]; then git describe --tags; fi') + ['@echo "Run normal regression tests for %s..."' %(rev.strip(),)]) testclean = Utility('test_cleanup', [], 'rm -f test_bits test_geoid test_json test_libgps test_mkgmtime test_packet') check = env.Alias('check', [ diff --git a/test_bits.c b/test_bits.c index 1b93a50e..cb8b2042 100644 --- a/test_bits.c +++ b/test_bits.c @@ -141,6 +141,9 @@ int main(int argc, char *argv[]) memcpy(buf + 24, "\x40\x49\x0f\xdb", 4); /*@ +observertrans +usereleased @*/ + if (!quiet) + (void)printf("Testing bitfield extraction\n"); + /*@-type@*/ sb1 = getsb(buf, 0); sb2 = getsb(buf, 8); @@ -202,7 +205,6 @@ int main(int argc, char *argv[]) if (ub1 != 1) printf("getub(buf, 0) FAILED\n"); if (ub2 != 0xff) printf("getub(buf, 8) FAILED\n"); - (void)printf("Testing bitfield extraction\n"); for (up = unsigned_tests; up < unsigned_tests + sizeof(unsigned_tests) / sizeof(unsigned_tests[0]); |