diff options
Diffstat (limited to 'subversion/tests/cmdline/getopt_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/getopt_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/subversion/tests/cmdline/getopt_tests.py b/subversion/tests/cmdline/getopt_tests.py index f4e6398..ed6470c 100755 --- a/subversion/tests/cmdline/getopt_tests.py +++ b/subversion/tests/cmdline/getopt_tests.py @@ -38,10 +38,6 @@ import svntest #---------------------------------------------------------------------- -# This directory contains all the expected output from svn. -getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]), - 'getopt_tests_data') - # Naming convention for golden files: take the svn command line as a # single string and apply the following sed transformations: # echo svn option1 option2 ... | sed -e 's/ /_/g' -e 's/_--/--/g' @@ -51,6 +47,10 @@ getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]), def load_expected_output(basename): "load the expected standard output and standard error" + # This directory contains all the expected output from svn. + getopt_output_dir = os.path.join(os.path.dirname(sys.argv[0]), + 'getopt_tests_data') + stdout_filename = os.path.join(getopt_output_dir, basename + '_stdout') stderr_filename = os.path.join(getopt_output_dir, basename + '_stderr') @@ -229,7 +229,7 @@ def getopt_config_option(sbox): expected_stderr = '.*W205000.*did you mean.*' expected_stdout = svntest.verify.AnyOutput svntest.actions.run_and_verify_svn2(expected_stdout, expected_stderr, 0, - 'info', + 'info', '--config-option', 'config:miscellanous:diff-extensions=' + '-u -p', |