Merge pull request #72 from cuviper/pretty-way

Use `CARGO_TARGET_TMPDIR` in integration tests

src/lib.rs

@@ -20,7 +20,8 @@
 //!
 //! fn main() {
 //! # // Normally, cargo will set `OUT_DIR` for build scripts.
-//! # std::env::set_var("OUT_DIR", "target");
+//! # let exe = std::env::current_exe().unwrap();
+//! # std::env::set_var("OUT_DIR", exe.parent().unwrap());
 //! let ac = autocfg::new();
 //! ac.emit_has_type("i128");
 //!
@@ -297,7 +298,8 @@ impl AutoCfg {
  /// ```
  /// # extern crate autocfg;
  /// # // Normally, cargo will set `OUT_DIR` for build scripts.
- /// # std::env::set_var("OUT_DIR", "target");
+ /// # let exe = std::env::current_exe().unwrap();
+ /// # std::env::set_var("OUT_DIR", exe.parent().unwrap());
  /// let ac = autocfg::new();
  /// assert!(ac.probe_raw("#![no_builtins]").is_ok());
  /// ```
@@ -312,7 +314,8 @@ impl AutoCfg {
  /// ```
  /// # extern crate autocfg;
  /// # // Normally, cargo will set `OUT_DIR` for build scripts.
- /// # std::env::set_var("OUT_DIR", "target");
+ /// # let exe = std::env::current_exe().unwrap();
+ /// # std::env::set_var("OUT_DIR", exe.parent().unwrap());
  /// let ac = autocfg::new();
  /// let code = r#"
  /// #![feature(slice_group_by)]

src/tests.rs

@@ -1,36 +1,5 @@
-use super::AutoCfg;
-use std::env;
 use std::path::Path;
 
-impl AutoCfg {
- fn core_std(&self, path: &str) -> String {
- let krate = if self.no_std { "core" } else { "std" };
- format!("{}::{}", krate, path)
- }
-
- fn assert_std(&self, probe_result: bool) {
- assert_eq!(!self.no_std, probe_result);
- }
-
- fn assert_min(&self, major: usize, minor: usize, probe_result: bool) {
- assert_eq!(self.probe_rustc_version(major, minor), probe_result);
- }
-
- fn for_test() -> Result<Self, super::error::Error> {
- match env::var_os("TESTS_TARGET_DIR") {
- Some(d) => Self::with_dir(d),
- None => Self::with_dir("target"),
- }
- }
-}
-
-#[test]
-fn autocfg_version() {
- let ac = AutoCfg::for_test().unwrap();
- println!("version: {:?}", ac.rustc_version);
- assert!(ac.probe_rustc_version(1, 0));
-}
-
 #[test]
 fn version_cmp() {
  use super::version::Version;
@@ -44,111 +13,6 @@ fn version_cmp() {
  assert!(Version::new(2, 0, 0) > v123);
 }
 
-#[test]
-fn probe_add() {
- let ac = AutoCfg::for_test().unwrap();
- let add = ac.core_std("ops::Add");
- let add_rhs = add.clone() + "<i32>";
- let add_rhs_output = add.clone() + "<i32, Output = i32>";
- let dyn_add_rhs_output = "dyn ".to_string() + &*add_rhs_output;
- assert!(ac.probe_path(&add));
- assert!(ac.probe_trait(&add));
- assert!(ac.probe_trait(&add_rhs));
- assert!(ac.probe_trait(&add_rhs_output));
- ac.assert_min(1, 27, ac.probe_type(&dyn_add_rhs_output));
-}
-
-#[test]
-fn probe_as_ref() {
- let ac = AutoCfg::for_test().unwrap();
- let as_ref = ac.core_std("convert::AsRef");
- let as_ref_str = as_ref.clone() + "<str>";
- let dyn_as_ref_str = "dyn ".to_string() + &*as_ref_str;
- assert!(ac.probe_path(&as_ref));
- assert!(ac.probe_trait(&as_ref_str));
- assert!(ac.probe_type(&as_ref_str));
- ac.assert_min(1, 27, ac.probe_type(&dyn_as_ref_str));
-}
-
-#[test]
-fn probe_i128() {
- let ac = AutoCfg::for_test().unwrap();
- let i128_path = ac.core_std("i128");
- ac.assert_min(1, 26, ac.probe_path(&i128_path));
- ac.assert_min(1, 26, ac.probe_type("i128"));
-}
-
-#[test]
-fn probe_sum() {
- let ac = AutoCfg::for_test().unwrap();
- let sum = ac.core_std("iter::Sum");
- let sum_i32 = sum.clone() + "<i32>";
- let dyn_sum_i32 = "dyn ".to_string() + &*sum_i32;
- ac.assert_min(1, 12, ac.probe_path(&sum));
- ac.assert_min(1, 12, ac.probe_trait(&sum));
- ac.assert_min(1, 12, ac.probe_trait(&sum_i32));
- ac.assert_min(1, 12, ac.probe_type(&sum_i32));
- ac.assert_min(1, 27, ac.probe_type(&dyn_sum_i32));
-}
-
-#[test]
-fn probe_std() {
- let ac = AutoCfg::for_test().unwrap();
- ac.assert_std(ac.probe_sysroot_crate("std"));
-}
-
-#[test]
-fn probe_alloc() {
- let ac = AutoCfg::for_test().unwrap();
- ac.assert_min(1, 36, ac.probe_sysroot_crate("alloc"));
-}
-
-#[test]
-fn probe_bad_sysroot_crate() {
- let ac = AutoCfg::for_test().unwrap();
- assert!(!ac.probe_sysroot_crate("doesnt_exist"));
-}
-
-#[test]
-fn probe_no_std() {
- let ac = AutoCfg::for_test().unwrap();
- assert!(ac.probe_type("i32"));
- assert!(ac.probe_type("[i32]"));
- ac.assert_std(ac.probe_type("Vec<i32>"));
-}
-
-#[test]
-fn probe_expression() {
- let ac = AutoCfg::for_test().unwrap();
- assert!(ac.probe_expression(r#""test".trim_left()"#));
- ac.assert_min(1, 30, ac.probe_expression(r#""test".trim_start()"#));
- ac.assert_std(ac.probe_expression("[1, 2, 3].to_vec()"));
-}
-
-#[test]
-fn probe_constant() {
- let ac = AutoCfg::for_test().unwrap();
- assert!(ac.probe_constant("1 + 2 + 3"));
- ac.assert_min(1, 33, ac.probe_constant("{ let x = 1 + 2 + 3; x * x }"));
- ac.assert_min(1, 39, ac.probe_constant(r#""test".len()"#));
-}
-
-#[test]
-fn probe_raw() {
- let ac = AutoCfg::for_test().unwrap();
- let prefix = if ac.no_std { "#![no_std]\n" } else { "" };
- let f = |s| format!("{}{}", prefix, s);
-
- // This attribute **must** be used at the crate level.
- assert!(ac.probe_raw(&f("#![no_builtins]")).is_ok());
-
- assert!(ac.probe_raw(&f("#![deny(dead_code)] fn x() {}")).is_err());
- assert!(ac.probe_raw(&f("#![allow(dead_code)] fn x() {}")).is_ok());
- assert!(ac
- .probe_raw(&f("#![deny(dead_code)] pub fn x() {}"))
- .is_ok());
-}
-
 #[test]
 fn dir_does_not_contain_target() {
  assert!(!super::dir_contains_target(

tests/no_std.rs

@@ -2,6 +2,8 @@ extern crate autocfg;
 
 use std::env;
 
+mod support;
+
 /// Tests that we can control the use of `#![no_std]`.
 #[test]
 fn no_std() {
@@ -10,10 +12,9 @@ fn no_std() {
  env::remove_var("TARGET");
 
  // Use the same path as this test binary.
- let dir = env::current_exe().unwrap().parent().unwrap().to_path_buf();
- env::set_var("OUT_DIR", &format!("{}", dir.display()));
+ let out = support::out_dir();
 
- let mut ac = autocfg::AutoCfg::new().unwrap();
+ let mut ac = autocfg::AutoCfg::with_dir(out.as_ref()).unwrap();
  assert!(!ac.no_std());
  assert!(ac.probe_path("std::mem"));
 

tests/rustflags.rs

@@ -2,18 +2,19 @@ extern crate autocfg;
 
 use std::env;
 
+mod support;
+
 /// Tests that autocfg uses the RUSTFLAGS or CARGO_ENCODED_RUSTFLAGS
 /// environment variables when running rustc.
 #[test]
 fn test_with_sysroot() {
- // Use the same path as this test binary.
- let dir = env::current_exe().unwrap().parent().unwrap().to_path_buf();
- env::set_var("OUT_DIR", &format!("{}", dir.display()));
+ let dir = support::exe_dir();
+ let out = support::out_dir();
 
  // If we have encoded rustflags, they take precedence, even if empty.
  env::set_var("CARGO_ENCODED_RUSTFLAGS", "");
  env::set_var("RUSTFLAGS", &format!("-L {}", dir.display()));
- let ac = autocfg::AutoCfg::new().unwrap();
+ let ac = autocfg::AutoCfg::with_dir(out.as_ref()).unwrap();
  assert!(ac.probe_sysroot_crate("std"));
  assert!(!ac.probe_sysroot_crate("autocfg"));
 
@@ -22,12 +23,12 @@ fn test_with_sysroot() {
  "CARGO_ENCODED_RUSTFLAGS",
  &format!("-L\x1f{}", dir.display()),
  );
- let ac = autocfg::AutoCfg::new().unwrap();
+ let ac = autocfg::AutoCfg::with_dir(out.as_ref()).unwrap();
  assert!(ac.probe_sysroot_crate("autocfg"));
 
  // Try the old-style RUSTFLAGS, ensuring HOST != TARGET.
  env::remove_var("CARGO_ENCODED_RUSTFLAGS");
  env::set_var("HOST", "lol");
- let ac = autocfg::AutoCfg::new().unwrap();
+ let ac = autocfg::AutoCfg::with_dir(out.as_ref()).unwrap();
  assert!(ac.probe_sysroot_crate("autocfg"));
 }

tests/support/mod.rs

@@ -0,0 +1,21 @@
+use std::borrow::Cow;
+use std::env;
+use std::path::{Path, PathBuf};
+
+/// The directory containing this test binary.
+pub fn exe_dir() -> PathBuf {
+ let exe = env::current_exe().unwrap();
+ exe.parent().unwrap().to_path_buf()
+}
+
+/// The directory to use for test probes.
+pub fn out_dir() -> Cow<'static, Path> {
+ if let Some(tmpdir) = option_env!("CARGO_TARGET_TMPDIR") {
+ Cow::Borrowed(tmpdir.as_ref())
+ } else if let Some(tmpdir) = env::var_os("TESTS_TARGET_DIR") {
+ Cow::Owned(tmpdir.into())
+ } else {
+ // Use the same path as this test binary.
+ Cow::Owned(exe_dir())
+ }
+}