Add BPF Loader 2 to cache

harness/src/program.rs

@@ -40,7 +40,7 @@ impl ProgramCache {
         &self.cache
     }
 
-    /// Add a program to a program cache.
+    /// Add a program to the cache.
     pub fn add_program(
         &mut self,
         program_id: &Pubkey,
@@ -70,9 +70,16 @@ impl ProgramCache {
             ),
         );
     }
+
+    /// Add a builtin program to the cache.
+    pub fn add_builtin(&mut self, builtin: Builtin) {
+        let program_id = builtin.program_id;
+        let entry = builtin.program_cache_entry();
+        self.cache.replenish(program_id, entry);
+    }
 }
 
-struct Builtin {
+pub struct Builtin {
     program_id: Pubkey,
     name: &'static str,
     entrypoint: BuiltinFunctionWithContext,
@@ -94,6 +101,11 @@ static BUILTINS: &[Builtin] = &[
         name: "system_program",
         entrypoint: solana_system_program::system_processor::Entrypoint::vm,
     },
+    Builtin {
+        program_id: bpf_loader::id(),
+        name: "solana_bpf_loader_program",
+        entrypoint: solana_bpf_loader_program::Entrypoint::vm,
+    },
     Builtin {
         program_id: bpf_loader_upgradeable::id(),
         name: "solana_bpf_loader_upgradeable_program",

scripts/build-test-programs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cargo build-sbf --manifest-path test-programs/cpi-target/Cargo.toml
+cargo build-sbf --manifest-path test-programs/primary/Cargo.toml