Treat fuchsia like a normal git repo

Author: tmandry

src/tools/cargotest/main.rs

@@ -13,6 +13,8 @@ struct Test {
     manifest_path: Option<&'static str>,
     /// `filters` are passed to libtest (i.e., after a `--` in the `cargo test` invocation).
     filters: &'static [&'static str],
+    override_script: Option<&'static Path>,
+    run_by_default: bool,
 }
 
 const TEST_REPOS: &[Test] = &[
@@ -25,6 +27,8 @@ const TEST_REPOS: &[Test] = &[
         features: None,
         manifest_path: None,
         filters: &[],
+        override_script: None,
+        run_by_default: true,
     },
     Test {
         name: "ripgrep",
@@ -35,6 +39,8 @@ const TEST_REPOS: &[Test] = &[
         features: None,
         manifest_path: None,
         filters: &[],
+        override_script: None,
+        run_by_default: true,
     },
     Test {
         name: "tokei",
@@ -45,6 +51,8 @@ const TEST_REPOS: &[Test] = &[
         features: None,
         manifest_path: None,
         filters: &[],
+        override_script: None,
+        run_by_default: true,
     },
     Test {
         name: "xsv",
@@ -69,6 +77,8 @@ const TEST_REPOS: &[Test] = &[
             "test_stats::",
             "test_table::",
         ],
+        override_script: None,
+        run_by_default: true,
     },
     Test {
         name: "servo",
@@ -81,6 +91,8 @@ const TEST_REPOS: &[Test] = &[
         features: None,
         manifest_path: None,
         filters: &[],
+        override_script: None,
+        run_by_default: true,
     },
     Test {
         name: "diesel",
@@ -97,6 +109,21 @@ const TEST_REPOS: &[Test] = &[
         // (This is required to set the feature flags above)
         manifest_path: Some("diesel/Cargo.toml"),
         filters: &[],
+        override_script: None,
+        run_by_default: true,
+    },
+    Test {
+        name: "fuchsia",
+        repo: "https://fuchsia.googlesource.com/fuchsia.git",
+        // TODO
+        sha: "refs/changes/58/938058/1",
+        lock: None,
+        packages: &[],
+        features: None,
+        manifest_path: None,
+        filters: &[],
+        override_script: Some(Path::new("scripts/rust/build_fuchsia_from_rust_ci.sh")),
+        run_by_default: false,
     },
 ];
 
@@ -107,7 +134,10 @@ fn main() {
     let cargo = &Path::new(cargo);
 
     for test in TEST_REPOS.iter().rev() {
-        if args[3..].is_empty() || args[3..].iter().any(|s| s.contains(test.name)) {
+        // TODO: uninvert run_by_default below
+        if (args[3..].is_empty() && !test.run_by_default)
+            || args[3..].iter().any(|s| s.contains(test.name))
+        {
             test_repo(cargo, out_dir, test);
         }
     }
@@ -119,8 +149,18 @@ fn test_repo(cargo: &Path, out_dir: &Path, test: &Test) {
     if let Some(lockfile) = test.lock {
         fs::write(&dir.join("Cargo.lock"), lockfile).unwrap();
     }
-    if !run_cargo_test(cargo, &dir, test.packages, test.features, test.manifest_path, test.filters)
-    {
+    let success = match test.override_script {
+        Some(script) => run_script(&dir, script),
+        None => run_cargo_test(
+            cargo,
+            &dir,
+            test.packages,
+            test.features,
+            test.manifest_path,
+            test.filters,
+        ),
+    };
+    if !success {
         panic!("tests failed for {}", test.repo);
     }
 }
@@ -148,9 +188,10 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
             assert!(status.success());
         }
 
+        let reset_to = if test.sha.contains('/') { "FETCH_HEAD" } else { test.sha };
         let status = Command::new("git")
             .arg("reset")
-            .arg(test.sha)
+            .arg(reset_to)
             .arg("--hard")
             .current_dir(&out_dir)
             .status()
@@ -165,6 +206,7 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
     if !found {
         panic!("unable to find commit {}", test.sha)
     }
+
     let status =
         Command::new("git").arg("clean").arg("-fdx").current_dir(&out_dir).status().unwrap();
     assert!(status.success());
@@ -216,3 +258,7 @@ fn run_cargo_test(
 
     status.success()
 }
+
+fn run_script(crate_path: &Path, script: &'static Path) -> bool {
+    Command::new(&crate_path.join(script)).status().unwrap().success()
+}