Fix cargo-build/test-bpf --workspace (#16431)

ci/test-stable.sh

@@ -44,14 +44,10 @@ test-stable-perf)
   ./cargo-build-bpf --manifest-path sdk/Cargo.toml
 
   # BPF Program unit tests
-  for program in programs/bpf/rust/*; do
+  "$cargo" test --manifest-path programs/bpf/Cargo.toml
-    if [ -d "${program}" ]; then
+  cargo-build-bpf --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
-      _ "$cargo" test --manifest-path "$program"/Cargo.toml
-      _ cargo-build-bpf --manifest-path "$program"/Cargo.toml --bpf-sdk sdk/bpf
-    fi
-  done
 
-  # BPF program tests
+  # BPF program system tests
   _ make -C programs/bpf/c tests
   _ "$cargo" stable test \
     --manifest-path programs/bpf/Cargo.toml \

sdk/cargo-build-bpf/src/main.rs

@@ -401,8 +401,14 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
         .packages
         .iter()
         .filter(|package| {
-            package.manifest_path.with_file_name("Xargo.toml").exists()
+            if metadata.workspace_members.contains(&package.id) {
-                && metadata.workspace_members.contains(&package.id)
+                for target in package.targets.iter() {
+                    if target.kind.contains(&"cdylib".to_string()) {
+                        return true;
+                    }
+                }
+            }
+            false
         })
         .collect::<Vec<_>>();
 

sdk/cargo-test-bpf/src/main.rs

@@ -152,8 +152,14 @@ fn test_bpf(config: Config, manifest_path: Option<PathBuf>) {
         .packages
         .iter()
         .filter(|package| {
-            package.manifest_path.with_file_name("Xargo.toml").exists()
+            if metadata.workspace_members.contains(&package.id) {
-                && metadata.workspace_members.contains(&package.id)
+                for target in package.targets.iter() {
+                    if target.kind.contains(&"cdylib".to_string()) {
+                        return true;
+                    }
+                }
+            }
+            false
         })
         .collect::<Vec<_>>();