Changeset 156475 in webkit
- Timestamp:
- Sep 26, 2013 10:57:53 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
-
ChangeLog (modified) (1 diff)
-
Scripts/webkitpy/port/xvfbdriver.py (modified) (1 diff)
-
Scripts/webkitpy/port/xvfbdriver_unittest.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r156472 r156475 1 2013-09-26 Zan Dobersek <zdobersek@igalia.com> 2 3 XvfbDriver should set up Xvfb instances providing screens of 8-bit depth 4 https://bugs.webkit.org/show_bug.cgi?id=121951 5 6 Reviewed by Carlos Garcia Campos. 7 8 Screens with 24-bit depth are causing problems as it doesn't seem to be possible to fall back to 9 software rendering successfully on the GTK 64-bit release builder, resulting in crashes in almost 10 500 layout tests that trigger accelerated compositing to be used. 11 12 * Scripts/webkitpy/port/xvfbdriver.py: 13 (XvfbDriver._start): 14 * Scripts/webkitpy/port/xvfbdriver_unittest.py: Update unit test baselines. 15 (XvfbDriverTest.test_start_no_pixel_tests): 16 (XvfbDriverTest.test_start_pixel_tests): 17 (XvfbDriverTest.test_start_arbitrary_worker_number): 18 (XvfbDriverTest.test_next_free_display): 19 (XvfbDriverTest.test_start_next_worker): 20 1 21 2013-09-26 Tim Horton <timothy_horton@apple.com> 2 22 -
trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py
r156461 r156475 75 75 self._lock_file = "/tmp/.X%d-lock" % display_id 76 76 77 run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "800x600x 24", "-nolisten", "tcp"]77 run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "800x600x8", "-nolisten", "tcp"] 78 78 with open(os.devnull, 'w') as devnull: 79 79 self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull) -
trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py
r148502 r156475 67 67 def test_start_no_pixel_tests(self): 68 68 driver = self.make_driver() 69 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x 24', '-nolisten', 'tcp']\n"69 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x8', '-nolisten', 'tcp']\n" 70 70 self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0") 71 71 self.cleanup_driver(driver) … … 73 73 def test_start_pixel_tests(self): 74 74 driver = self.make_driver() 75 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x 24', '-nolisten', 'tcp']\n"75 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x8', '-nolisten', 'tcp']\n" 76 76 self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True) 77 77 self.cleanup_driver(driver) … … 79 79 def test_start_arbitrary_worker_number(self): 80 80 driver = self.make_driver(worker_number=17) 81 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x 24', '-nolisten', 'tcp']\n"81 expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x8', '-nolisten', 'tcp']\n" 82 82 self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True) 83 83 self.cleanup_driver(driver) 84 84 85 85 def test_next_free_display(self): 86 output = "Xorg /usr/bin/X :0 -auth /var/run/lightdm/root/:0 -nolisten tcp vt7 -novtswitch -background none\nXvfb Xvfb :1 -screen 0 800x600x 24-nolisten tcp"86 output = "Xorg /usr/bin/X :0 -auth /var/run/lightdm/root/:0 -nolisten tcp vt7 -novtswitch -background none\nXvfb Xvfb :1 -screen 0 800x600x8 -nolisten tcp" 87 87 executive = MockExecutive2(output) 88 88 driver = self.make_driver(executive=executive) … … 94 94 self.assertEqual(driver._next_free_display(), 1) 95 95 self.cleanup_driver(driver) 96 output = "Xvfb Xvfb :0 -screen 0 800x600x 24-nolisten tcp"96 output = "Xvfb Xvfb :0 -screen 0 800x600x8 -nolisten tcp" 97 97 executive = MockExecutive2(output) 98 98 driver = self.make_driver(executive=executive) 99 99 self.assertEqual(driver._next_free_display(), 1) 100 100 self.cleanup_driver(driver) 101 output = "Xvfb Xvfb :1 -screen 0 800x600x 24 -nolisten tcp\nXvfb Xvfb :0 -screen 0 800x600x24 -nolisten tcp\nXvfb Xvfb :3 -screen 0 800x600x24-nolisten tcp"101 output = "Xvfb Xvfb :1 -screen 0 800x600x8 -nolisten tcp\nXvfb Xvfb :0 -screen 0 800x600x8 -nolisten tcp\nXvfb Xvfb :3 -screen 0 800x600x8 -nolisten tcp" 102 102 executive = MockExecutive2(output) 103 103 driver = self.make_driver(executive=executive) … … 108 108 driver = self.make_driver() 109 109 driver._next_free_display = lambda: 0 110 expected_logs = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x 24', '-nolisten', 'tcp']\n"110 expected_logs = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x8', '-nolisten', 'tcp']\n" 111 111 self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True) 112 112 self.cleanup_driver(driver) 113 113 driver = self.make_driver() 114 114 driver._next_free_display = lambda: 3 115 expected_logs = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '800x600x 24', '-nolisten', 'tcp']\n"115 expected_logs = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '800x600x8', '-nolisten', 'tcp']\n" 116 116 self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":3", pixel_tests=True) 117 117 self.cleanup_driver(driver)
Note: See TracChangeset
for help on using the changeset viewer.
