From 87caf028b11209eb1b44c4539ed44f9f82b45bf9 Mon Sep 17 00:00:00 2001
From: Bogdan Mart <mart.bogdan@gmail.com>
Date: Thu, 24 Jan 2019 01:51:57 +0200
Subject: [PATCH] Use compiletest_rs flags supported by stable toolchain, and
 fixed it's version in place.

Made Travis CI run all tests on almost all platforms, except oldest rustc 1.20 which is incompatible with compiletest_rs.

Now all tests could be run locally without Nightly, and on more platforms in CI.
---
 .gitignore            | 2 ++
 .travis.yml           | 4 +++-
 test_suite/Cargo.toml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9d37c56..fbd9642b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 target
 Cargo.lock
+
+/.idea/
diff --git a/.travis.yml b/.travis.yml
index 73ff8454..60773baa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,18 @@ branches:
   - /.*(.tmp)$/
 
 language: rust
+env: EXTRA_ARGS="--features unstable"
 matrix:
   include:
     # This version is tested to avoid unintentional bumping of the minimum supported Rust version
     - rust: 1.20.0
+      # This version don't support unstable features
+      env: EXTRA_ARGS=""
     - rust: stable
     - rust: stable
       os: osx
     - rust: beta
     - rust: nightly
-      env: EXTRA_ARGS="--features unstable"
 
 sudo: false
 script:
diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
index b084b8cf..2a02d80d 100644
--- a/test_suite/Cargo.toml
+++ b/test_suite/Cargo.toml
@@ -7,7 +7,7 @@ unstable = ["compiletest_rs"]
 
 [dependencies]
 bitflags = { path = "../" }
-compiletest_rs = { version = "*", optional = true }
+compiletest_rs = { version = "0.3.18", optional = true, features=["stable"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"