servo: Merge #13722 - Remove test-geckolib, run test-stylo on travis (from Manishearth:test-stylo); r=jdm
authorManish Goregaokar <manishsmail@gmail.com>
Thu, 13 Oct 2016 01:50:37 -0500
changeset 386549 085c36cd4da4e86ad9c3bfe66c141f805216baf9
parent 386548 1772a7cd220095aa288f5093d93b07343fb087e1
child 386550 3270b6fe6ad91f5edfc1d4d2691a0a5e95094238
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
servo: Merge #13722 - Remove test-geckolib, run test-stylo on travis (from Manishearth:test-stylo); r=jdm test-geckolib used to do things, but almost all of geckolib has been moved to the style crate, with the tests in `tests/unit/stylo`. (`./mach test-stylo) Now test-geckolib does nothing. Fixes #13721 r? @jdm Source-Repo: https://github.com/servo/servo Source-Revision: 2bb7cc227bf2a3260e3b9c4f3953ca55d93629fe
servo/.travis.yml
servo/components/style/lib.rs
servo/python/servo/testing_commands.py
--- a/servo/.travis.yml
+++ b/servo/.travis.yml
@@ -10,17 +10,17 @@ matrix:
       cache: false
     - sudo: 9000
       dist: trusty
       script:
          - ./mach build -d --verbose
          - ./mach test-compiletest
          - ./mach test-unit
          - ./mach build-geckolib
-         - ./mach test-geckolib
+         - ./mach test-stylo
          - bash etc/ci/check_no_unwrap.sh
          - bash etc/ci/lockfile_changed.sh
          - bash etc/ci/manifest_changed.sh
       cache:
         directories:
           - .cargo
           - .servo
           - $HOME/.ccache
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@@ -57,17 +57,17 @@ extern crate cssparser;
 extern crate deque;
 extern crate encoding;
 extern crate euclid;
 extern crate fnv;
 extern crate heapsize;
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate lazy_static;
-extern crate libc;
+#[cfg(feature = "gecko")] extern crate libc;
 #[macro_use]
 extern crate log;
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate matches;
 #[cfg(feature = "gecko")] extern crate nsstring_vendor as nsstring;
 extern crate num_integer;
 extern crate num_traits;
--- a/servo/python/servo/testing_commands.py
+++ b/servo/python/servo/testing_commands.py
@@ -153,27 +153,16 @@ class MachCommands(CommandBase):
     def suite_for_path(self, path_arg):
         if os.path.exists(path.abspath(path_arg)):
             abs_path = path.abspath(path_arg)
             for prefix, suite in TEST_SUITES_BY_PREFIX.iteritems():
                 if abs_path.startswith(prefix):
                     return suite
         return None
 
-    @Command('test-geckolib',
-             description='Test geckolib sanity checks',
-             category='testing')
-    def test_geckolib(self):
-        self.ensure_bootstrapped()
-
-        env = self.build_env()
-        env["RUST_BACKTRACE"] = "1"
-
-        return call(["cargo", "test"], env=env, cwd=path.join("ports", "geckolib"))
-
     @Command('test-perf',
              description='Run the page load performance test',
              category='testing')
     def test_perf(self):
         self.ensure_bootstrapped()
         env = self.build_env()
         return call(["bash", "test_perf.sh"],
                     env=env,