Unverified Commit 15f6194a authored by boklm's avatar boklm
Browse files

Set default resolution to 1280x1024 in xorg.conf 

We set this in xorg.conf instead of resizing using xrandr, to avoid
fonts resize problems.

This does not remove the problem for resolution defined in each test
(currently not used). To fix that, we may need to start a specific X
server for the test.
parent be6b67f3

TBBTestSuite/BrowserBundleTests.pm

+0 −1
Original line number Original line Diff line number Diff line
@@ -485,7 +485,6 @@ sub pre_tests { 
    $ENV{TOR_SKIP_LAUNCH} = 1;

    $ENV{TOR_SKIP_LAUNCH} = 1;

    if ($options->{xdummy}) {

    if ($options->{xdummy}) {

        $tbbinfos->{Xdisplay} = start_X("$tbbinfos->{'results-dir'}/xorg.log");

        $tbbinfos->{Xdisplay} = start_X("$tbbinfos->{'results-dir'}/xorg.log");

        set_Xmode($tbbinfos->{Xdisplay}, $options->{resolution});

    }

    }

}

}

TBBTestSuite/BrowserUnitTests.pm

+0 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,6 @@ sub pre_tests { 
    $tbbinfos->{topobjdir} = "obj-$config_guess";

    $tbbinfos->{topobjdir} = "obj-$config_guess";

    if ($options->{xdummy}) {

    if ($options->{xdummy}) {

        $tbbinfos->{Xdisplay} = start_X("$tbbinfos->{'results-dir'}/xorg.log");

        $tbbinfos->{Xdisplay} = start_X("$tbbinfos->{'results-dir'}/xorg.log");

        set_Xmode($tbbinfos->{Xdisplay}, $options->{resolution});

    }

    }

}

}

TBBTestSuite/Options.pm

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ my %default_options = ( 
    'tor-socks-port'   => '9550',

    'tor-socks-port'   => '9550',

    'reports-dir'      => "$FindBin::Bin/reports",

    'reports-dir'      => "$FindBin::Bin/reports",

    virtualenv => "$FindBin::Bin/virtualenv",

    virtualenv => "$FindBin::Bin/virtualenv",

    resolution => '1024x768',

    resolution => '1280x1024',

    xvfb       => 0,

    xvfb       => 0,

    xdummy     => $OSNAME ne 'cygwin',

    xdummy     => $OSNAME ne 'cygwin',

    mbox       => has_bin('mbox'),

    mbox       => has_bin('mbox'),

data/xorg.conf

+1 −5
Original line number Original line Diff line number Diff line
@@ -116,11 +116,7 @@ Section "Screen" 
    Viewport 0 0

    Viewport 0 0

    Depth 24

    Depth 24

    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"

    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"

    Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"

    Modes "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"

    #Virtual 32000 32000

    #Virtual 16384 8192

    Virtual 8192 4096

    #Virtual 5120 3200

  EndSubSection

  EndSubSection

EndSection

EndSection