add command_output to llvmfilecheck

Author: Oneirical

src/tools/run-make-support/src/lib.rs

@@ -29,7 +29,9 @@ pub use wasmparser;
 pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};
 pub use clang::{clang, Clang};
 pub use diff::{diff, Diff};
-pub use llvm::{llvm_profdata, llvm_readobj, llvm_filecheck, LlvmProfdata, LlvmReadobj, LlvmFilecheck};
+pub use llvm::{
+    llvm_filecheck, llvm_profdata, llvm_readobj, LlvmFilecheck, LlvmProfdata, LlvmReadobj,
+};
 pub use run::{cmd, run, run_fail, run_with_args};
 pub use rustc::{aux_build, rustc, Rustc};
 pub use rustdoc::{bare_rustdoc, rustdoc, Rustdoc};

src/tools/run-make-support/src/llvm.rs

@@ -1,9 +1,8 @@
-use std::path::{Path, PathBuf};
-use std::process::{Command, Output};
-use std::io::{BufReader, Read, Write};
 use std::fs::File;
+use std::io::{BufReader, Read, Write};
+use std::path::{Path, PathBuf};
 
-use crate::{env_var, handle_failed_output};
+use crate::{env_var, Command};
 
 /// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
 /// at `$LLVM_BIN_DIR/llvm-readobj`.
@@ -42,11 +41,12 @@ pub struct LlvmFilecheck {
 }
 
 crate::impl_common_helpers!(LlvmReadobj);
+crate::impl_common_helpers!(LlvmProfdata);
+crate::impl_common_helpers!(LlvmFilecheck);
 
 /// Generate the path to the bin directory of LLVM.
 pub fn llvm_bin_dir() -> PathBuf {
-    let llvm_bin_dir = env_var("LLVM_BIN_DIR")
-    .expect("`LLVM_BIN_DIR` not specified, but this is required to find `llvm-readobj`");
+    let llvm_bin_dir = env_var("LLVM_BIN_DIR");
     PathBuf::from(llvm_bin_dir)
 }
 
@@ -70,12 +70,6 @@ impl LlvmReadobj {
         self.cmd.arg("--file-header");
         self
     }
-
-    /// Get the [`Output`][::std::process::Output] of the finished process.
-    #[track_caller]
-    pub fn command_output(&mut self) -> Output {
-        self.cmd.output().expect("failed to get output of finished process")
-    }
 }
 
 impl LlvmProfdata {
@@ -89,13 +83,13 @@ impl LlvmProfdata {
 
     /// Provide an input file.
     pub fn input<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
-        self.cmd.arg("-o");
         self.cmd.arg(path.as_ref());
         self
     }
 
     /// Specify the output file path.
     pub fn output<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
+        self.cmd.arg("-o");
         self.cmd.arg(path.as_ref());
         self
     }
@@ -106,12 +100,6 @@ impl LlvmProfdata {
         self.cmd.arg("merge");
         self
     }
-
-    /// Get the [`Output`][::std::process::Output] of the finished process.
-    #[track_caller]
-    pub fn command_output(&mut self) -> Output {
-        self.cmd.output().expect("failed to get output of finished process")
-    }
 }
 
 impl LlvmFilecheck {

src/tools/run-make-support/src/run.rs

@@ -59,7 +59,7 @@ pub fn run(name: &str) -> CompletedProcess {
 /// Run a built binary with one or more argument(s) and make sure it succeeds.
 #[track_caller]
 pub fn run_with_args(name: &str, args: &[&str]) -> CompletedProcess {
-    let caller = std::panic::Location::caller();
+    let caller = panic::Location::caller();
     let mut cmd = run_common(name, Some(args));
     let output = cmd.run();
     if !output.status().success() {

tests/run-make/pgo-branch-weights/rmake.rs

@@ -13,14 +13,17 @@
 // (This test has problems generating profdata on mingw. This could use further investigation.)
 //@ ignore-windows-gnu
 
-use run_make_support::{llvm_filecheck, llvm_profdata, run_with_args, rustc, rustdoc, target};
+use run_make_support::{llvm_filecheck, llvm_profdata, run_with_args, rustc};
 use std::fs;
+use std::path::Path;
+
+//FIXME(Oneirical): Edit this test to use fs_wrapper and rmake_out_path.
 
 fn main() {
     let path_prof_data_dir = Path::new("prof_data_dir");
     let path_merged_profdata = path_prof_data_dir.join("merged.profdata");
     rustc().input("opaque.rs").run();
-    fs::create_dir_all(&path_prof_data_dir);
+    fs::create_dir_all(&path_prof_data_dir).unwrap();
     rustc()
         .input("interesting.rs")
         .profile_generate(&path_prof_data_dir)
@@ -37,5 +40,5 @@ fn main() {
         .codegen_units(1)
         .emit("llvm-ir")
         .run();
-    llvm_filecheck().patterns("filecheck-patterns.txt").stdin("interesting_ll").run();
+    llvm_filecheck().patterns("filecheck-patterns.txt").stdin("interesting.ll").run();
 }