From 7a847c2d5dc449c416c0fa2ee7a7e05d0a241392 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 5 Feb 2012 21:41:35 +0000 Subject: Update to r65/autowaf and waf-1.6.10. git-svn-id: http://svn.drobilla.net/serd/trunk@302 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/uri.c | 6 ++++-- waf | Bin 91015 -> 91475 bytes wscript | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/uri.c b/src/uri.c index d329c4b5..fbd9e03d 100644 --- a/src/uri.c +++ b/src/uri.c @@ -364,8 +364,10 @@ serd_uri_serialise(const SerdURI* uri, SerdSink sink, void* stream) } while (up > 0 && (--base_last > uri->path_base.buf)); // Write base URI prefix - const size_t base_len = base_last - uri->path_base.buf + 1; - WRITE(uri->path_base.buf, base_len); + if (*base_last == '/') { + const size_t base_len = base_last - uri->path_base.buf + 1; + WRITE(uri->path_base.buf, base_len); + } } else { // Relative path is just query or fragment, append to base URI diff --git a/waf b/waf index f532f38d..907b9847 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index bdf0360a..b3f4337a 100644 --- a/wscript +++ b/wscript @@ -316,6 +316,13 @@ def test(ctx): autowaf.run_tests(ctx, APPNAME, ['serd_test'], dirs=['.']) + autowaf.run_tests(ctx, APPNAME, [ + 'serdi_static -o turtle %s/tests/base.ttl "base.ttl" > tests/base.ttl.out' % srcdir], + 0, name='base') + + if not file_equals('%s/tests/base.ttl' % srcdir, 'tests/base.ttl.out'): + Logs.pprint('RED', 'FAIL: build/tests/base.ttl.out is incorrect') + nul = os.devnull autowaf.run_tests(ctx, APPNAME, [ 'serdi_static file://%s/tests/manifest.ttl > %s' % (srcdir, nul), -- cgit v1.2.1