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 a434afd9 authored by boklm's avatar boklm
Browse files

Remove support for pre #11641 directory layout

parent 46a81aeb
......@@ -52,7 +52,6 @@ my %default_options = (
xdummy => $OSNAME ne 'cygwin',
use_strace => 0,
virustotal => 0,
newlayout => 1,
'virustotal-api-key-file' => "$ENV{HOME}/.virustotal.api-key",
'email-to' => [],
'email-from' => 'TBB Test Report <tbbtest@example.com>',
......@@ -74,8 +73,7 @@ sub get_options {
action=s enable-tests=s upload-to=s os=s arch=s
virustotal! email-to=s@ email-from=s email-subject=s
mozmill-dir=s reports-url=s http-proxy-port=i
newlayout! xdummy! disable-tests=s
testrequests_types=s testsuite=s);
xdummy! disable-tests=s testrequests_types=s testsuite=s);
my (%cli, %config);
Getopt::Long::GetOptionsFromArray(\@_, \%cli, @options) || exit 1;
$cli{args} = \@_ if @_;
......
......@@ -509,7 +509,7 @@ sub extract_tbb {
} else {
$tbbinfos->{tbbdir} = "$tmpdir/tor-browser_$tbbinfos->{language}";
}
$tbbinfos->{tbbdir} .= '/Browser' if $options->{newlayout};
$tbbinfos->{tbbdir} .= '/Browser';
} elsif ($tbbinfos->{os} eq 'Windows') {
my (undef, undef, $f) = File::Spec->splitpath($tbbfile);
copy($tbbfile, "$tmpdir/$f");
......@@ -725,15 +725,9 @@ sub selenium_run {
sub set_tbbpaths {
my ($tbbinfos) = @_;
if ($options->{newlayout}) {
$tbbinfos->{ffbin} = "$tbbinfos->{tbbdir}/firefox";
$tbbinfos->{tordir} = "$tbbinfos->{tbbdir}/TorBrowser/Tor";
$tbbinfos->{datadir} = "$tbbinfos->{tbbdir}/TorBrowser/Data";
} else {
$tbbinfos->{ffbin} = "$tbbinfos->{tbbdir}/Browser/firefox";
$tbbinfos->{tordir} = "$tbbinfos->{tbbdir}/Tor";
$tbbinfos->{datadir} = "$tbbinfos->{tbbdir}/Data";
}
$tbbinfos->{ffbin} = "$tbbinfos->{tbbdir}/firefox";
$tbbinfos->{tordir} = "$tbbinfos->{tbbdir}/TorBrowser/Tor";
$tbbinfos->{datadir} = "$tbbinfos->{tbbdir}/TorBrowser/Data";
$tbbinfos->{torbin} = "$tbbinfos->{tordir}/tor";
$tbbinfos->{ptdir} = winpath("$tbbinfos->{tordir}/PluggableTransports");
$tbbinfos->{ffprofiledir} = "$tbbinfos->{datadir}/Browser/profile.default";
......
......@@ -218,16 +218,16 @@ the tests to try your new test. In this case, the '--enable-tests'
option is useful to run only the test that you added:
----
$ ./tbb-testsuite --no-newlayout --enable-tests my_new_test /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
$ ./tbb-testsuite --enable-tests my_new_test /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
----
If your test requires a running Tor daemon, you may need to enable the 'tor_bootstrap' test too:
----
$ ./tbb-testsuite --no-newlayout --enable-tests tor_bootstrap,my_new_test /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
$ ./tbb-testsuite --enable-tests tor_bootstrap,my_new_test /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
----
Alternatively you may use an already running Tor daemon with the '--tor-socks-port' option:
----
$ ./tbb-testsuite --no-newlayout --enable-tests my_new_test --tor-socks-port=9150 /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
$ ./tbb-testsuite --enable-tests my_new_test --tor-socks-port=9150 /path/to/tor-browser-linux64-3.6.6_ko.tar.xz
----
......@@ -147,9 +147,6 @@ Available options
Select the port used to start an http proxy, for tor_bootstrap
tests that require an http proxy.
--no-newlayout::
Disable the use of the new layout introduced with ticket #11641.
Configuration Files
-------------------
......
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