aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-08-23 23:21:19 +0000
committerDavid Robillard <d@drobilla.net>2011-08-23 23:21:19 +0000
commita15dc730bd895f5a52ad3dd9cae29e10e6d761ef (patch)
tree4a4ea8e7c887a62da549996b6834c47a0540675e
parentda8c163fac0272c8eb6a719c5a0661b4152e0399 (diff)
downloadserd-a15dc730bd895f5a52ad3dd9cae29e10e6d761ef.tar.gz
serd-a15dc730bd895f5a52ad3dd9cae29e10e6d761ef.tar.bz2
serd-a15dc730bd895f5a52ad3dd9cae29e10e6d761ef.zip
Don't use non-portable './serdi_static/ syntax in test suite command lines.
Instead, modify PATH to include the current directory. git-svn-id: http://svn.drobilla.net/serd/trunk@215 490d8e77-9747-427b-9fa3-0b8f29cee8a0
-rw-r--r--wscript45
1 files changed, 23 insertions, 22 deletions
diff --git a/wscript b/wscript
index 707c00ca..7f72601b 100644
--- a/wscript
+++ b/wscript
@@ -211,35 +211,36 @@ def test(ctx):
autowaf.pre_test(ctx, APPNAME)
+ os.environ['PATH'] = '.' + os.pathsep + os.getenv('PATH')
nul = os.devnull
autowaf.run_tests(ctx, APPNAME, [
- './serdi_static file:%s/tests/manifest.ttl > %s' % (srcdir, nul),
- './serdi_static file://%s/tests/manifest.ttl > %s' % (srcdir, nul),
- './serdi_static %s/tests/UTF-8.ttl > %s' % (srcdir, nul),
- './serdi_static -v > %s' % nul,
- './serdi_static -h > %s' % nul,
- './serdi_static -s "<foo> a <#Thingie> ." > %s' % nul,
- './serdi_static %s > %s' % (nul, nul)],
+ 'serdi_static file:%s/tests/manifest.ttl > %s' % (srcdir, nul),
+ 'serdi_static file://%s/tests/manifest.ttl > %s' % (srcdir, nul),
+ 'serdi_static %s/tests/UTF-8.ttl > %s' % (srcdir, nul),
+ 'serdi_static -v > %s' % nul,
+ 'serdi_static -h > %s' % nul,
+ 'serdi_static -s "<foo> a <#Thingie> ." > %s' % nul,
+ 'serdi_static %s > %s' % (nul, nul)],
0, name='serdi-cmd-good')
autowaf.run_tests(ctx, APPNAME, [
- './serdi_static > %s' % nul,
- './serdi_static ftp://example.org/unsupported.ttl > %s' % nul,
- './serdi_static -i > %s' % nul,
- './serdi_static -o > %s' % nul,
- './serdi_static -z > %s' % nul,
- './serdi_static -p > %s' % nul,
- './serdi_static -c > %s' % nul,
- './serdi_static -i illegal > %s' % nul,
- './serdi_static -o illegal > %s' % nul,
- './serdi_static -i turtle > %s' % nul,
- './serdi_static /no/such/file > %s' % nul],
+ 'serdi_static > %s' % nul,
+ 'serdi_static ftp://example.org/unsupported.ttl > %s' % nul,
+ 'serdi_static -i > %s' % nul,
+ 'serdi_static -o > %s' % nul,
+ 'serdi_static -z > %s' % nul,
+ 'serdi_static -p > %s' % nul,
+ 'serdi_static -c > %s' % nul,
+ 'serdi_static -i illegal > %s' % nul,
+ 'serdi_static -o illegal > %s' % nul,
+ 'serdi_static -i turtle > %s' % nul,
+ 'serdi_static /no/such/file > %s' % nul],
1, name='serdi-cmd-bad')
commands = []
for test in good_tests:
base_uri = 'http://www.w3.org/2001/sw/DataAccess/df1/' + test
- commands += [ './serdi_static %s/%s \'%s\' > %s.out' % (srcdir, test, base_uri, test) ]
+ commands += [ 'serdi_static %s/%s \'%s\' > %s.out' % (srcdir, test, base_uri, test) ]
autowaf.run_tests(ctx, APPNAME, commands, 0, name='good')
@@ -257,7 +258,7 @@ def test(ctx):
commands = []
for test in bad_tests:
- commands += [ './serdi_static %s/%s \'http://www.w3.org/2001/sw/DataAccess/df1/%s\' > %s.out' % (srcdir, test, test, test) ]
+ commands += [ 'serdi_static %s/%s \'http://www.w3.org/2001/sw/DataAccess/df1/%s\' > %s.out' % (srcdir, test, test, test) ]
autowaf.run_tests(ctx, APPNAME, commands, 1, name='bad')
@@ -270,8 +271,8 @@ def test(ctx):
out_filename = test + '.thru'
commands += [
'%s -o turtle -p foo %s/%s \'%s\' | %s -i turtle -c foo - \'%s\' | sed \'s/_:docid/_:genid/g\' > %s.thru' % (
- './serdi_static', srcdir, test, base_uri,
- './serdi_static', base_uri, test) ]
+ 'serdi_static', srcdir, test, base_uri,
+ 'serdi_static', base_uri, test) ]
autowaf.run_tests(ctx, APPNAME, commands, 0, name='turtle-round-trip')
Logs.pprint('BOLD', '\nVerifying ntriples => turtle => ntriples')