Skip to content

Commit 7dec64f

Browse files
blepblep
committed
Moved jsontestrunner data from test/ to test/data.
1 parent 45c499d commit 7dec64f

File tree

83 files changed

+4
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4
-3
lines changed

‎SConstruct‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,9 @@ def runJSONTests_action( target, source = None, env = None ):
262262
# Add test scripts to python path
263263
jsontest_path = Dir( '#test' ).abspath
264264
sys.path.insert( 0, jsontest_path )
265+
data_path = os.path.join( jsontest_path, 'data' )
265266
import runjsontests
266-
return runjsontests.runAllTests( os.path.abspath(source[0].path), jsontest_path )
267+
return runjsontests.runAllTests( os.path.abspath(source[0].path), data_path )
267268

268269
def runJSONTests_string( target, source = None, env = None ):
269270
return 'RunJSONTests("%s")' % source[0]

‎test/cleantests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
paths = []
66
for pattern in [ '*.actual', '*.actual-rewrite', '*.rewrite', '*.process-output' ]:
7-
paths += glob.glob( pattern )
7+
paths += glob.glob( 'data/' + pattern )
88

99
for path in paths:
1010
os.unlink( path )

test/test_array_01.expected renamed to test/data/test_array_01.expected

File renamed without changes.

test/test_array_01.json renamed to test/data/test_array_01.json

File renamed without changes.

test/test_array_02.expected renamed to test/data/test_array_02.expected

File renamed without changes.

test/test_array_02.json renamed to test/data/test_array_02.json

File renamed without changes.

test/test_array_03.expected renamed to test/data/test_array_03.expected

File renamed without changes.

test/test_array_03.json renamed to test/data/test_array_03.json

File renamed without changes.

test/test_array_04.expected renamed to test/data/test_array_04.expected

File renamed without changes.

test/test_array_04.json renamed to test/data/test_array_04.json

File renamed without changes.

0 commit comments

Comments
 (0)