Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test-dromaeo can't find osmesa #20319

Closed
jdm opened this issue Mar 16, 2018 · 2 comments
Closed

test-dromaeo can't find osmesa #20319

jdm opened this issue Mar 16, 2018 · 2 comments

Comments

@jdm
Copy link
Member

@jdm jdm commented Mar 16, 2018

This made it work for me and xanework:

diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 8ed67964ba..b534289903 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -690,8 +690,12 @@ class MachCommands(CommandBase):
         # Check that a release servo build exists
         bin_path = path.abspath(self.get_binary_path(release, dev))
 
-        return check_call(
-            [run_file, "|".join(tests), bin_path, base_dir])
+        self.set_software_rendering_env(release)
+
+        run_globals = {"__file__": run_file}
+        execfile(run_file, run_globals)
+        return run_globals["start"]("|".join(tests), bin_path, base_dir)
+
 
     def set_software_rendering_env(self, use_release):
         # On Linux and mac, find the OSMesa software rendering library and
diff --git a/tests/dromaeo/run_dromaeo.py b/tests/dromaeo/run_dromaeo.py
index 8f7127f8c7..506c053517 100755
--- a/tests/dromaeo/run_dromaeo.py
+++ b/tests/dromaeo/run_dromaeo.py
@@ -44,11 +44,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         return
 
 
-if __name__ == '__main__':
-    if len(sys.argv) == 4:
-        tests = sys.argv[1]
-        servo_exe = sys.argv[2]
-        base_dir = sys.argv[3]
+def start(tests, servo_exe, base_dir):
         os.chdir(base_dir)
 
         # Ensure servo binary can be found
@@ -75,5 +71,13 @@ if __name__ == '__main__':
         for test in data:
             print(" {0}{1} | {2}".format(test, " " * (l - len(test)), data[test]))
         proc.kill()
+
+
+if __name__ == '__main__':
+    if len(sys.argv) == 4:
+        tests = sys.argv[1]
+        servo_exe = sys.argv[2]
+        base_dir = sys.argv[3]
+        start(tests, servo_exe, base_dir)
     else:
         print_usage() 
@jdm
Copy link
Member Author

@jdm jdm commented Mar 16, 2018

This is probably also true for test-jquery.

@SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Apr 20, 2020

OSMesa is no longer used since #25853, is this still relevant?

@jdm jdm closed this Apr 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
You can’t perform that action at this time.