about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-07-29 06:13:07 +0200
committerGitHub <noreply@github.com>2023-07-29 06:13:07 +0200
commit68dc15924162744db18abb56683802687befbd26 (patch)
tree1bf9215e43a8cd3c88372674164df0e1ce8ad768
parent5df97c6bb9a6070a39feff128520293ba6bddbd0 (diff)
parent8548689af21e916b17fa96b00d742717c3c51a5e (diff)
downloadrust-68dc15924162744db18abb56683802687befbd26.tar.gz
rust-68dc15924162744db18abb56683802687befbd26.zip
Rollup merge of #114172 - fortanix:raoul/fix_process-spawning_test, r=workingjubilee
Fix issue_15149 test for the SGX target

PR https://github.com/rust-lang/rust/pull/112390 moved tests to std. Unfortunately, this caused the `issue_15149` test to be enabled for the SGX target. This is incorrect as the SGX target does not support the `env::current_exe()` call.
-rw-r--r--library/std/tests/process_spawning.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/tests/process_spawning.rs b/library/std/tests/process_spawning.rs
index 52e5b55fb9d..46dc9ff00bd 100644
--- a/library/std/tests/process_spawning.rs
+++ b/library/std/tests/process_spawning.rs
@@ -1,3 +1,5 @@
+#![cfg(not(target_env="sgx"))]
+
 use std::env;
 use std::fs;
 use std::process;