From ba733168c69586aa285560de31079c959e4da0f5 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 3 Feb 2021 23:14:09 +0000
Subject: [PATCH] Fix which shared object the test uses (bp #15060) (#15067)

* Fix which shared object the test uses (#15060)

(cherry picked from commit 02a5f7104afc2bdac121f1bdcace8b5aea8ec59f)

# Conflicts:
#	programs/bpf/tests/programs.rs

* fix conflicts

Co-authored-by: Jack May <jack@solana.com>
---
 programs/bpf/tests/programs.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index 6e403de1d9..3c772c081f 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1532,7 +1532,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
         &buffer_keypair,
         &program_keypair,
         &authority_keypair,
-        "noop",
+        "solana_bpf_rust_noop",
     );
 
     let invoke_instruction = Instruction::new(
@@ -1552,7 +1552,7 @@ fn test_program_bpf_upgrade_and_invoke_in_same_tx() {
 
     // Prepare for upgrade
     let buffer_keypair = Keypair::new();
-    let path = create_bpf_path("panic");
+    let path = create_bpf_path("solana_bpf_rust_panic");
     let mut file = File::open(&path).unwrap_or_else(|err| {
         panic!("Failed to open {}: {}", path.display(), err);
     });
@@ -1709,7 +1709,7 @@ fn test_program_bpf_disguised_as_bpf_loader() {
     }
     #[cfg(feature = "bpf_rust")]
     {
-        programs.extend_from_slice(&[("noop")]);
+        programs.extend_from_slice(&[("solana_bpf_rust_noop")]);
     }
 
     for program in programs.iter() {
@@ -1853,7 +1853,12 @@ fn test_program_bpf_upgrade_self_via_cpi() {
     bank.add_builtin(&name, id, entrypoint);
     let bank = Arc::new(bank);
     let bank_client = BankClient::new_shared(&bank);
-    let noop_program_id = load_bpf_program(&bank_client, &bpf_loader::id(), &mint_keypair, "noop");
+    let noop_program_id = load_bpf_program(
+        &bank_client,
+        &bpf_loader::id(),
+        &mint_keypair,
+        "solana_bpf_rust_noop",
+    );
 
     // Deploy upgradeable program
     let buffer_keypair = Keypair::new();
@@ -1888,7 +1893,7 @@ fn test_program_bpf_upgrade_self_via_cpi() {
 
     // Prepare for upgrade
     let buffer_keypair = Keypair::new();
-    let path = create_bpf_path("panic");
+    let path = create_bpf_path("solana_bpf_rust_panic");
     let mut file = File::open(&path).unwrap_or_else(|err| {
         panic!("Failed to open {}: {}", path.display(), err);
     });