parent
874fd5390b
commit
047daa08c8
@ -1,39 +0,0 @@
|
||||
From 1915a0ac72e22fef906351858478eebadf81c4cf Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <cuviper@gmail.com>
|
||||
Date: Tue, 19 Nov 2019 14:06:44 -0800
|
||||
Subject: [PATCH] Use the test's current_exe() to find the target dir
|
||||
|
||||
---
|
||||
tests/rustflags.rs | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/rustflags.rs b/tests/rustflags.rs
|
||||
index bfa0f03ee0ef..119376c409a8 100644
|
||||
--- a/tests/rustflags.rs
|
||||
+++ b/tests/rustflags.rs
|
||||
@@ -1,13 +1,19 @@
|
||||
extern crate autocfg;
|
||||
|
||||
+use std::env;
|
||||
+
|
||||
/// Tests that autocfg uses the RUSTFLAGS environment variable when running
|
||||
/// rustc.
|
||||
#[test]
|
||||
fn test_with_sysroot() {
|
||||
- std::env::set_var("RUSTFLAGS", "-L target/debug/deps -L target/debug");
|
||||
- std::env::set_var("OUT_DIR", "target");
|
||||
+ // Use the same path as this test binary.
|
||||
+ let dir = env::current_exe().unwrap().parent().unwrap().to_path_buf();
|
||||
+ env::set_var("RUSTFLAGS", &format!("-L {}", dir.display()));
|
||||
+ env::set_var("OUT_DIR", &format!("{}", dir.display()));
|
||||
+
|
||||
// Ensure HOST != TARGET.
|
||||
- std::env::set_var("HOST", "lol");
|
||||
+ env::set_var("HOST", "lol");
|
||||
+
|
||||
let ac = autocfg::AutoCfg::new().unwrap();
|
||||
assert!(ac.probe_sysroot_crate("autocfg"));
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
@ -1 +1 @@
|
||||
SHA512 (autocfg-0.1.7.crate) = 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
|
||||
SHA512 (autocfg-1.0.0.crate) = 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
|
||||
|
Loading…
Reference in new issue