From 4ca9d25ccceaa198c4e92b86d8ad8b8d01fb87ff Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 9 Jan 2015 22:28:20 -0600 Subject: [PATCH 1/2] Revert "Merge pull request #108 from open-source-parsers/quote-spaces" This reverts commit dfc5f879c168d11fe2f4ef686ab33bbecdc5679f, reversing changes made to 0f6884f771eae221873b345af2c6369ccf7dcb5b. --- test/runjsontests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/runjsontests.py b/test/runjsontests.py index 2defb53ae..a1f6082b5 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -1,8 +1,8 @@ from __future__ import print_function -from glob import glob import sys import os -import pipes +import os.path +from glob import glob import optparse VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes ' @@ -56,7 +56,7 @@ def runAllTests( jsontest_executable_path, input_dir = None, options = is_json_checker_test and '--json-checker' or '' pipe = os.popen( "%s%s %s %s" % ( valgrind_path, jsontest_executable_path, options, - pipes.quote(input_path))) + input_path) ) process_output = pipe.read() status = pipe.close() if is_json_checker_test: From d98b5f4230bf84d6282ca635eedebc2e1e0822dc Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 9 Jan 2015 22:32:10 -0600 Subject: [PATCH 2/2] quote spaces in commands for Windows See comments at: https://github.com/open-source-parsers/jsoncpp/commit/1a4dc3a888c7e6e179503250ccb391820a586b1b --- test/runjsontests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runjsontests.py b/test/runjsontests.py index a1f6082b5..9422d57d9 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -54,7 +54,7 @@ def runAllTests( jsontest_executable_path, input_dir = None, is_json_checker_test = (input_path in test_jsonchecker) or expect_failure print('TESTING:', input_path, end=' ') options = is_json_checker_test and '--json-checker' or '' - pipe = os.popen( "%s%s %s %s" % ( + pipe = os.popen( '%s%s %s "%s"' % ( valgrind_path, jsontest_executable_path, options, input_path) ) process_output = pipe.read()