Near 100% branch coverage.

git-svn-id: http://svn.drobilla.net/serd/trunk@277 490d8e77-9747-427b-9fa3-0b8f29cee8a0

1 files changed, 7 insertions, 4 deletions

diff --git a/wscript b/wscript
index a823dc0a..783d66b5 100644
--- a/wscript
+++ b/wscript
@@ -327,15 +327,18 @@ def test(ctx):
     thru_tests.remove('tests/test-id.ttl') # IDs are mapped so files won't be identical
 
     commands = []
-    bulk = False
+    num = 0
     for test in thru_tests:
+        num += 1
+        bulk = (num % 2 == 0)
+        full = (num % 5 == 0)
         base_uri = 'http://www.w3.org/2001/sw/DataAccess/df1/' + test
         out_filename = test + '.thru'
         commands += [
-            '%s %s -o turtle -p foo %s/%s \'%s\' | %s -i turtle -o ntriples -c foo - \'%s\' | sed \'s/_:docid/_:genid/g\' > %s.thru' % (
-                'serdi_static', '-b' if bulk else '  ', srcdir, test, base_uri,
+            '%s %s %s -i ntriples -o turtle -p foo %s/%s \'%s\' | %s -i turtle -o ntriples -c foo - \'%s\' | sed \'s/_:docid/_:genid/g\' > %s.thru' % (
+                'serdi_static', '-b' if bulk else '  ', '-f' if full else '  ',
+                srcdir, test, base_uri,
                 'serdi_static', base_uri, test) ]
-        bulk = not bulk
 
     autowaf.run_tests(ctx, APPNAME, commands, 0, name='turtle-round-trip')
     Logs.pprint('BOLD', '\nVerifying ntriples => turtle => ntriples')