fix libstd tests

Author: nagisa

compiler/rustc_target/src/spec/json.rs

@@ -152,6 +152,7 @@ impl Target {
         forward!(is_like_wasm);
         forward!(is_like_android);
         forward!(is_like_vexos);
+        forward!(is_like_solana);
         forward!(binary_format);
         forward!(default_dwarf_version);
         forward!(allows_weak_linkage);
@@ -350,6 +351,7 @@ impl ToJson for Target {
         target_option_val!(is_like_wasm);
         target_option_val!(is_like_android);
         target_option_val!(is_like_vexos);
+        target_option_val!(is_like_solana);
         target_option_val!(binary_format);
         target_option_val!(default_dwarf_version);
         target_option_val!(allows_weak_linkage);
@@ -572,6 +574,7 @@ struct TargetSpecJson {
     is_like_wasm: Option<bool>,
     is_like_android: Option<bool>,
     is_like_vexos: Option<bool>,
+    is_like_solana: Option<bool>,
     binary_format: Option<BinaryFormat>,
     default_dwarf_version: Option<u32>,
     allows_weak_linkage: Option<bool>,

library/std/src/panicking.rs

@@ -13,14 +13,15 @@ use core::panic::Location;
 #[cfg(not(target_family = "solana"))]
 use core::panic::PanicPayload;
 
-#[cfg(not(target_family = "solana"))]
 // make sure to use the stderr output configured
 // by libtest in the real copy of std
-#[cfg(all(test, not(target_family = "solana")))]
-use realstd::io::set_output_capture;
+#[cfg(not(target_family = "solana"))]
+#[cfg(test)]
+use realstd::io::try_set_output_capture;
 
 use crate::any::Any;
-#[cfg(all(not(test), not(target_arch = "bpf"), not(target_arch = "sbf")))]
+#[cfg(not(target_family = "solana"))]
+#[cfg(not(test))]
 use crate::io::try_set_output_capture;
 #[cfg(not(target_family = "solana"))]
 use crate::mem::{self, ManuallyDrop};