- fixed SCons build on Windows: only build static library (support static/dynamic at the same time requires significant changes)
- renamed SCons glob tool to globtool to avoid clash with python glob module. This prevented running the tests.
- check target now works with SCons 1.x
diff --git a/test/jsontestrunner.py b/test/jsontestrunner.py
index a076d0c..504f3db 100644
--- a/test/jsontestrunner.py
+++ b/test/jsontestrunner.py
@@ -44,15 +44,15 @@
assert False and "Unexpected value type"
def parseAndSaveValueTree( input, actual_path ):
- root = json.read( input )
+ root = json.loads( input )
fout = file( actual_path, 'wt' )
valueTreeToString( fout, root )
fout.close()
return root
def rewriteValueTree( value, rewrite_path ):
- rewrite = json.write( value )
- rewrite = rewrite[1:-1] # Somehow the string is quoted ! jsonpy bug ?
+ rewrite = json.dumps( value )
+ #rewrite = rewrite[1:-1] # Somehow the string is quoted ! jsonpy bug ?
file( rewrite_path, 'wt').write( rewrite + '\n' )
return rewrite