GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Unverified Commit 974d1824 authored by boklm's avatar boklm
Browse files

Fix PYTHONPATH on Windows

On Windows the paths in PYTHONPATH are separated by ';' and not ':'.
parent 26d22e7c
......@@ -724,9 +724,10 @@ sub marionette_run {
my $bin = $OSNAME eq 'cygwin' ? 'Scripts' : 'bin';
my $marionette_test = $test->{marionette_test} // $test->{name};
my $pypath = $ENV{PYTHONPATH};
$ENV{PYTHONPATH} //= '';
$ENV{PYTHONPATH} = winpath("$FindBin::Bin/marionette/tor_browser_tests/lib")
. ":$ENV{PYTHONPATH}";
my $old_pypath = $ENV{PYTHONPATH};
$ENV{PYTHONPATH} = winpath("$FindBin::Bin/marionette/tor_browser_tests/lib");
my $sep = $OSNAME eq 'cygwin' ? ';' : ':';
$ENV{PYTHONPATH} .= $sep . $old_pypath if $old_pypath;
system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette/$bin/tor-browser-tests",
'--log-unittest', winpath($result_file_txt),
'--log-html', winpath($result_file_html),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment