diff options
author | montellese <montellese@xbmc.org> | 2011-06-03 16:25:07 +0200 |
---|---|---|
committer | montellese <montellese@xbmc.org> | 2011-06-03 16:25:07 +0200 |
commit | 3565ad579e9b80f4be57db901d3fe44d9bfac87d (patch) | |
tree | 23b7218b1aacdbd6e3299a614ce8073ae93cc86f /lib/jsoncpp/test/rununittests.py | |
parent | 648af1e56953eb1c9aeeebfc5826c6a828d4ebbb (diff) | |
parent | fee62a4d040f6eb3e44e703f2f80846a6aaa57ea (diff) |
replace jsoncpp with yajl (thanks topfs2)
* topfs2/remove_jsoncpp: (21 commits)
Fix. Added explicit typecast to platform int to quench warnings for variant use in jsonrpc
[win32] replace jsoncpp with yajl
Removed jsoncpp
Added pragma and license to IClient.h
Removed the dependency of jsoncpp in CVariant
Switched to use CVariant instead of jsoncpp values in JSON-RPC
Added yajl writer for Variant
Added yajl parser for Variant
Added c_str and have size of variant work with strings
Added check for libyajl to configure
Added CVariant::type which returns the type of the current variant (easier than multiple isFoo queries)
Switched Variant to use double internally, still accepts floats
Added swap method to CVariant
Moved to use explicit type in CVariant instead of isFoo
Added operator== to CVariant
Added array and map iterators to CVariant
Added CVariant constructor which takes a string pointer and length
Added append to CVariant
Added isMember to CVariant
Removed debug in CVariant
...
Conflicts:
Makefile.in
configure.in
project/VS2010Express/XBMC.vcxproj
xbmc/interfaces/json-rpc/AudioLibrary.cpp
xbmc/interfaces/json-rpc/FileItemHandler.cpp
xbmc/interfaces/json-rpc/FileItemHandler.h
xbmc/interfaces/json-rpc/VideoLibrary.cpp
Diffstat (limited to 'lib/jsoncpp/test/rununittests.py')
-rw-r--r-- | lib/jsoncpp/test/rununittests.py | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/lib/jsoncpp/test/rununittests.py b/lib/jsoncpp/test/rununittests.py deleted file mode 100644 index 366184cfb5..0000000000 --- a/lib/jsoncpp/test/rununittests.py +++ /dev/null @@ -1,73 +0,0 @@ -import sys -import os -import os.path -import subprocess -from glob import glob -import optparse - -VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes' - -class TestProxy(object): - def __init__( self, test_exe_path, use_valgrind=False ): - self.test_exe_path = os.path.normpath( os.path.abspath( test_exe_path ) ) - self.use_valgrind = use_valgrind - - def run( self, options ): - if self.use_valgrind: - cmd = VALGRIND_CMD.split() - else: - cmd = [] - cmd.extend( [self.test_exe_path, '--test-auto'] + options ) - process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) - stdout = process.communicate()[0] - if process.returncode: - return False, stdout - return True, stdout - -def runAllTests( exe_path, use_valgrind=False ): - test_proxy = TestProxy( exe_path, use_valgrind=use_valgrind ) - status, test_names = test_proxy.run( ['--list-tests'] ) - if not status: - print >> sys.stderr, "Failed to obtain unit tests list:\n" + test_names - return 1 - test_names = [name.strip() for name in test_names.strip().split('\n')] - failures = [] - for name in test_names: - print 'TESTING %s:' % name, - succeed, result = test_proxy.run( ['--test', name] ) - if succeed: - print 'OK' - else: - failures.append( (name, result) ) - print 'FAILED' - failed_count = len(failures) - pass_count = len(test_names) - failed_count - if failed_count: - print - for name, result in failures: - print result - print '%d/%d tests passed (%d failure(s))' % ( - pass_count, len(test_names), failed_count) - return 1 - else: - print 'All %d tests passed' % len(test_names) - return 0 - -def main(): - from optparse import OptionParser - parser = OptionParser( usage="%prog [options] <path to test_lib_json.exe>" ) - parser.add_option("--valgrind", - action="store_true", dest="valgrind", default=False, - help="run all the tests using valgrind to detect memory leaks") - parser.enable_interspersed_args() - options, args = parser.parse_args() - - if len(args) != 1: - parser.error( 'Must provides at least path to test_lib_json executable.' ) - sys.exit( 1 ) - - exit_code = runAllTests( args[0], use_valgrind=options.valgrind ) - sys.exit( exit_code ) - -if __name__ == '__main__': - main() |