Merge pull request #135 from dvente/master

add timeout functionality for bisecting hangs
rust-lang · Oct 8, 2021 · 34b0328 · 34b0328
2 parents 63a18d8 + 615f70c
commit 34b0328
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -114,6 +114,13 @@ struct Opts {
     )]
     prompt: bool,
 
+    #[structopt(
+        long = "timeout",
+        short = "t",
+        help = "Assume failure after specified number of seconds (for bisecting hangs)"
+    )]
+    timeout: Option<usize>,
+
     #[structopt(short = "v", long = "verbose", parse(from_occurrences))]
     verbosity: usize,
 

diff --git a/src/toolchains.rs b/src/toolchains.rs
@@ -317,14 +317,15 @@ impl Toolchain {
                     .join(&format!("target-{}", self.rustup_name())),
             );
         }
-        let mut cmd = match cfg.args.script {
-            Some(ref script) => {
+
+        let mut cmd = match (cfg.args.script.as_ref(), cfg.args.timeout) {
+            (Some(script), None) => {
                 let mut cmd = Command::new(script);
                 cmd.env("RUSTUP_TOOLCHAIN", self.rustup_name());
                 cmd.args(&cfg.args.command_args);
                 cmd
             }
-            None => {
+            (None, None) => {
                 let mut cmd = Command::new("cargo");
                 cmd.arg(&format!("+{}", self.rustup_name()));
                 if cfg.args.command_args.is_empty() {
@@ -334,6 +335,26 @@ impl Toolchain {
                 }
                 cmd
             }
+            (Some(script), Some(timeout)) => {
+                let mut cmd = Command::new("timeout");
+                cmd.arg(timeout.to_string());
+                cmd.arg(script);
+                cmd.args(&cfg.args.command_args);
+                cmd.env("RUSTUP_TOOLCHAIN", self.rustup_name());
+                cmd
+            }
+            (None, Some(timeout)) => {
+                let mut cmd = Command::new("timeout");
+                cmd.arg(timeout.to_string());
+                cmd.arg("cargo");
+                cmd.arg(format!("+{}", self.rustup_name()));
+                if cfg.args.command_args.is_empty() {
+                    cmd.arg("build");
+                } else {
+                    cmd.args(&cfg.args.command_args);
+                }
+                cmd
+            }
         };
         cmd.current_dir(&cfg.args.test_dir);
         cmd.env("CARGO_TARGET_DIR", format!("target-{}", self.rustup_name()));
@@ -377,6 +398,14 @@ impl Toolchain {
                 let output = self.run_test(cfg);
                 let status = output.status;
 
+                //timeout returns exit code 124 on expiration
+                if status.code() == Some(124) {
+                    match cfg.args.timeout {
+                        Some(_) => break TestOutcome::Regressed,
+                        None => panic!("Process timed out but no timeout was specified. Please check host configuration for timeouts and try again.")
+                    }
+                }
+
                 eprintln!("\n\n{} finished with exit code {:?}.", self, status.code());
                 eprintln!("please select an action to take:");