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

Add the --no-PTtests option to disable pluggable transport tests

parent ea2200b4
......@@ -61,6 +61,7 @@ my %default_options = (
test_data_dir => winpath("$FindBin::Bin/test-data"),
testsuite => undef,
cleanup => 1,
PTtests => 1,
);
......@@ -72,7 +73,7 @@ sub get_options {
virustotal! email-to=s@ email-from=s email-subject=s
reports-url=s http-proxy-port=i
xdummy! disable-tests=s testrequests_types=s testsuite=s
cleanup!);
cleanup! PTtests!);
my (%cli, %config);
Getopt::Long::GetOptionsFromArray(\@_, \%cli, @options) || exit 1;
$cli{args} = \@_ if @_;
......
......@@ -128,7 +128,7 @@ our @tests = (
name => 'tor_bridge',
type => 'tor_bootstrap',
descr => 'Access tor using a bridge',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......@@ -136,14 +136,14 @@ our @tests = (
type => 'tor_bootstrap',
descr => 'Access tor using a bridge and an http proxy',
httpproxy => 1,
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_obfs3',
type => 'tor_bootstrap',
descr => 'Access tor using obfs3',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......@@ -151,14 +151,14 @@ our @tests = (
type => 'tor_bootstrap',
descr => 'Access tor using obfs3 and an http proxy',
httpproxy => 1,
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_obfs4',
type => 'tor_bootstrap',
descr => 'Access tor using obfs4',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......@@ -166,14 +166,14 @@ our @tests = (
type => 'tor_bootstrap',
descr => 'Access tor using obfs4 and an http proxy',
httpproxy => 1,
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_fte',
type => 'tor_bootstrap',
descr => 'Access tor using fteproxy',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......@@ -181,14 +181,14 @@ our @tests = (
type => 'tor_bootstrap',
descr => 'Access tor using fteproxy and an http proxy',
httpproxy => 1,
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_scramblesuit',
type => 'tor_bootstrap',
descr => 'Access tor using scramblesuit',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......@@ -196,21 +196,21 @@ our @tests = (
type => 'tor_bootstrap',
descr => 'Access tor using scramblesuit and an http proxy',
httpproxy => 1,
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_meek-amazon',
type => 'tor_bootstrap',
descr => 'Access tor using meek-amazon',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
name => 'tor_meek-azure',
type => 'tor_bootstrap',
descr => 'Access tor using meek-azure',
enable => sub { $OSNAME eq 'linux' },
enable => sub { $OSNAME eq 'linux' && $options->{PTtests} },
run_once => 1,
},
{
......
......@@ -136,6 +136,9 @@ Available options
Disable cleanup of tmp directory after running the testsuite.
This can be useful for debugging.
--no-PTtests::
Disable Pluggable Transport tests.
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