From 4fda3a3ceb460d5552fdfdc53470f2cb4678f44a Mon Sep 17 00:00:00 2001
From: Jon Cinque <jon.cinque@gmail.com>
Date: Sat, 16 Apr 2022 02:46:07 +0200
Subject: [PATCH] ci: Fixup downstream build for token-cli (#24403)

---
 scripts/build-downstream-projects.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/build-downstream-projects.sh b/scripts/build-downstream-projects.sh
index 133e33839..465c6d239 100755
--- a/scripts/build-downstream-projects.sh
+++ b/scripts/build-downstream-projects.sh
@@ -58,11 +58,15 @@ spl() {
 
     ./patch.crates-io.sh "$solana_dir"
 
-    $cargo build
-    $cargo test
     for program in "${PROGRAMS[@]}"; do
       $cargo_test_bpf --manifest-path "$program"/Cargo.toml
     done
+
+    # TODO better: `build.rs` for spl-token-cli doesn't seem to properly build
+    # the required programs to run the tests, so instead we run the tests
+    # after we know programs have been built
+    $cargo build
+    $cargo test
   )
 }