2 files changed, 0 insertions, 134 deletions
diff --git a/src/3rd_party-static/jsoncpp b/src/3rd_party-static/jsoncpp
new file mode 160000
+Subproject 9e0d70aa66e6ba993dd05723ca64c26ab00f357
diff --git a/src/3rd_party-static/jsoncpp/test/runjsontests.py b/src/3rd_party-static/jsoncpp/test/runjsontests.py
deleted file mode 100644
index ffe8bd51ea..0000000000
--- a/src/3rd_party-static/jsoncpp/test/runjsontests.py
+++ /dev/null
@@ -1,134 +0,0 @@
-import sys
-import os
-import os.path
-from glob import glob
-import optparse
-
-VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes '
-
-def compareOutputs( expected, actual, message ):
-    expected = expected.strip().replace('\r','').split('\n')
-    actual = actual.strip().replace('\r','').split('\n')
-    diff_line = 0
-    max_line_to_compare = min( len(expected), len(actual) )
-    for index in xrange(0,max_line_to_compare):
-        if expected[index].strip() != actual[index].strip():
-            diff_line = index + 1
-            break
-    if diff_line == 0 and len(expected) != len(actual):
-        diff_line = max_line_to_compare+1
-    if diff_line == 0:
-        return None
-    def safeGetLine( lines, index ):
-        index += -1
-        if index >= len(lines):
-            return ''
-        return lines[index].strip()
-    return """  Difference in %s at line %d:
-  Expected: '%s'
-  Actual:   '%s'
-""" % (message, diff_line,
-       safeGetLine(expected,diff_line),
-       safeGetLine(actual,diff_line) )
-        
-def safeReadFile( path ):
-    try:
-        return file( path, 'rt' ).read()
-    except IOError, e:
-        return '<File "%s" is missing: %s>' % (path,e)
-
-def runAllTests( jsontest_executable_path, input_dir = None,
-                 use_valgrind=False, with_json_checker=False ):
-    if not input_dir:
-        input_dir = os.path.join( os.getcwd(), 'data' )
-    tests = glob( os.path.join( input_dir, '*.json' ) )
-    if with_json_checker:
-        test_jsonchecker = glob( os.path.join( input_dir, '../jsonchecker', '*.json' ) )
-    else:
-        test_jsonchecker = []
-    failed_tests = []
-    valgrind_path = use_valgrind and VALGRIND_CMD or ''
-    for input_path in tests + test_jsonchecker:
-        expect_failure = os.path.basename( input_path ).startswith( 'fail' )
-        is_json_checker_test = (input_path in test_jsonchecker) or expect_failure
-        print 'TESTING:', input_path,
-        options = is_json_checker_test and '--json-checker' or ''
-        pipe = os.popen( "%s%s %s %s" % (
-            valgrind_path, jsontest_executable_path, options,
-            input_path) )
-        process_output = pipe.read()
-        status = pipe.close()
-        if is_json_checker_test:
-            if expect_failure:
-                if status is None:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, 'Parsing should have failed:\n%s' %
-                                          safeReadFile(input_path)) )
-                else:
-                    print 'OK'
-            else:
-                if status is not None:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
-                else:
-                    print 'OK'
-        else:
-            base_path = os.path.splitext(input_path)[0]
-            actual_output = safeReadFile( base_path + '.actual' )
-            actual_rewrite_output = safeReadFile( base_path + '.actual-rewrite' )
-            file(base_path + '.process-output','wt').write( process_output )
-            if status:
-                print 'parsing failed'
-                failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
-            else:
-                expected_output_path = os.path.splitext(input_path)[0] + '.expected'
-                expected_output = file( expected_output_path, 'rt' ).read()
-                detail = ( compareOutputs( expected_output, actual_output, 'input' )
-                            or compareOutputs( expected_output, actual_rewrite_output, 'rewrite' ) )
-                if detail:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, detail) )
-                else:
-                    print 'OK'
-
-    if failed_tests:
-        print
-        print 'Failure details:'
-        for failed_test in failed_tests:
-            print '* Test', failed_test[0]
-            print failed_test[1]
-            print
-        print 'Test results: %d passed, %d failed.' % (len(tests)-len(failed_tests),
-                                                       len(failed_tests) )
-        return 1
-    else:
-        print 'All %d tests passed.' % len(tests)
-        return 0
-
-def main():
-    from optparse import OptionParser
-    parser = OptionParser( usage="%prog [options] <path to jsontestrunner.exe> [test case directory]" )
-    parser.add_option("--valgrind",
-                  action="store_true", dest="valgrind", default=False,
-                  help="run all the tests using valgrind to detect memory leaks")
-    parser.add_option("-c", "--with-json-checker",
-                  action="store_true", dest="with_json_checker", default=False,
-                  help="run all the tests from the official JSONChecker test suite of json.org")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    if len(args) < 1 or len(args) > 2:
-        parser.error( 'Must provides at least path to jsontestrunner executable.' )
-        sys.exit( 1 )
-
-    jsontest_executable_path = os.path.normpath( os.path.abspath( args[0] ) )
-    if len(args) > 1:
-        input_path = os.path.normpath( os.path.abspath( args[1] ) )
-    else:
-        input_path = None
-    status = runAllTests( jsontest_executable_path, input_path,
-                          use_valgrind=options.valgrind, with_json_checker=options.with_json_checker )
-    sys.exit( status )
-
-if __name__ == '__main__':
-    main()