Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e8ef0a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "pdl: ensure we use ‘target/debug/pdl’ when running test with Cargo" am:...

Merge "pdl: ensure we use ‘target/debug/pdl’ when running test with Cargo" am: ff373caa am: 9c978496

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2135797



Change-Id: Iffc9e13bc3678f4378fdf83ef39a06c3049ba137
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20025a92 9c978496
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -17,13 +17,18 @@ fn strip_blank_lines(text: &str) -> String {
///
/// # Panics
///
/// Panics if `pdl` cannot be found on `$PATH` or if it returns a
/// non-zero exit code.
/// Panics if `pdl` cannot be found or if it fails.
fn pdl(code: &str) -> String {
    let tempdir = tempfile::tempdir().unwrap();
    let input = tempdir.path().join("input.pdl");
    fs::write(&input, code.as_bytes()).unwrap();
    let pdl_path = find_binary("pdl").unwrap();

    // Cargo will set `CARGO_BIN_EXE_pdl` when compiling the crate. If
    // we're not using Cargo, we search for `pdl` using find_binary.
    let pdl_path = match std::option_env!("CARGO_BIN_EXE_pdl") {
        Some(pdl_path) => std::path::PathBuf::from(pdl_path),
        None => find_binary("pdl").unwrap(),
    };
    let output = Command::new(&pdl_path)
        .arg("--output-format")
        .arg("rust")