Generate a script to rerun the failed sub-command in cargo-test-bpf (#18582)

* Generate a script to rerun the failed sub-command in cargo-test-bpf

* Generate a script to rerun the failed sub-command in cargo-build-bpf

* Add cargo-build-bpf test for generate-child-script-on-failure option

sdk/cargo-build-bpf/tests/crates.rs

@@ -7,7 +7,7 @@ use std::{
 #[macro_use]
 extern crate serial_test;
 
-fn run_cargo_build(extra_args: &[&str]) -> Output {
+fn run_cargo_build(crate_name: &str, extra_args: &[&str]) -> Output {
     let cwd = env::current_dir().expect("Unable to get current working directory");
     let root = cwd
         .parent()
@@ -17,7 +17,7 @@ fn run_cargo_build(extra_args: &[&str]) -> Output {
     let toml = cwd
         .join("tests")
         .join("crates")
-        .join("noop")
+        .join(crate_name)
         .join("Cargo.toml");
     let toml = format!("{}", toml.display());
     let mut args = vec!["--bpf-sdk", "../bpf", "--manifest-path", &toml];
@@ -42,7 +42,7 @@ fn run_cargo_build(extra_args: &[&str]) -> Output {
 #[test]
 #[serial]
 fn test_build() {
-    let output = run_cargo_build(&[]);
+    let output = run_cargo_build("noop", &[]);
     assert!(output.status.success());
 }
 
@@ -55,7 +55,7 @@ fn test_dump() {
         .status()
         .expect("Unable to install rustfilt required for --dump option")
         .success());
-    let output = run_cargo_build(&["--dump"]);
+    let output = run_cargo_build("noop", &["--dump"]);
     assert!(output.status.success());
     let cwd = env::current_dir().expect("Unable to get current working directory");
     let dump = cwd
@@ -71,10 +71,25 @@ fn test_dump() {
 #[test]
 #[serial]
 fn test_out_dir() {
-    let output = run_cargo_build(&["--bpf-out-dir", "tmp_out"]);
+    let output = run_cargo_build("noop", &["--bpf-out-dir", "tmp_out"]);
     assert!(output.status.success());
     let cwd = env::current_dir().expect("Unable to get current working directory");
     let dir = cwd.join("tmp_out");
     assert!(dir.exists());
     fs::remove_dir_all("tmp_out").expect("Failed to remove tmp_out dir");
 }
+
+#[test]
+#[serial]
+fn test_generate_child_script_on_failre() {
+    let output = run_cargo_build("fail", &["--generate-child-script-on-failure"]);
+    assert!(!output.status.success());
+    let cwd = env::current_dir().expect("Unable to get current working directory");
+    let scr = cwd
+        .join("tests")
+        .join("crates")
+        .join("fail")
+        .join("cargo-build-bpf-child-script-cargo.sh");
+    assert!(scr.exists());
+    fs::remove_file(scr).expect("Failed to remove script");
+}

sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "fail"
+version = "1.8.0"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+edition = "2018"
+publish = false
+
+[dependencies]
+solana-program = { path = "../../../../program", version = "=1.8.0" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[workspace]

sdk/cargo-build-bpf/tests/crates/fail/src/lib.rs

@@ -0,0 +1,15 @@
+//! @brief Example Rust-based BPF noop program
+
+extern crate solana_program;
+use solana_program::{
+    account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
+};
+
+entrypoint!(process_instruction);
+fn process_instruction(
+    _program_id: &Pubkey,
+    _accounts: &[AccountInfo],
+    _instruction_data: &[u8],
+) -> ProgramResult {
+    // error to make build fail: no return value
+}