Update surfman to 0.2 and remove glutin

python/servo/testing_commands.py

@@ -33,8 +33,8 @@ from mach.decorators import (
 )
 
 from servo.command_base import (
-    BuildNotFound, CommandBase,
-    call, check_call, check_output, set_osmesa_env,
+    CommandBase,
+    call, check_call, check_output,
 )
 from servo.util import host_triple
 
@@ -197,8 +197,6 @@ class MachCommands(CommandBase):
     @CommandArgument('--submit', '-a', default=False, action="store_true",
                      help="submit the data to perfherder")
     def test_perf(self, base=None, date=None, submit=False):
-        self.set_software_rendering_env(True, False)
-
         env = self.build_env()
         cmd = ["bash", "test_perf.sh"]
         if base:
@@ -441,8 +439,6 @@ class MachCommands(CommandBase):
 
     # Helper for test_css and test_wpt:
     def wptrunner(self, run_file, **kwargs):
-        self.set_software_rendering_env(kwargs['release'], kwargs['debugger'])
-
         # By default, Rayon selects the number of worker threads
         # based on the available CPU count. This doesn't work very
         # well when running tests on CI, since we run so many
@@ -753,18 +749,6 @@ class MachCommands(CommandBase):
         return check_call(
             [run_file, "|".join(tests), bin_path, base_dir])
 
-    def set_software_rendering_env(self, use_release, show_vars):
-        # On Linux and mac, find the OSMesa software rendering library and
-        # add it to the dynamic linker search path.
-        try:
-            bin_path = self.get_binary_path(use_release, not use_release)
-            if not set_osmesa_env(bin_path, os.environ, show_vars):
-                print("Warning: Cannot set the path to OSMesa library.")
-        except BuildNotFound:
-            # This can occur when cross compiling (e.g. arm64), in which case
-            # we won't run the tests anyway so can safely ignore this step.
-            pass
-
 
 def setup_clangfmt(env):
     cmd = "clang-format.exe" if sys.platform == "win32" else "clang-format"