Run ui tests only on stable

TeXitoi · Oct 9, 2019 · 6a3fc8b · 6a3fc8b
1 parent 8d86616
commit 6a3fc8b
Show file tree

Hide file tree

Showing 126 changed files with 3 additions and 1,027 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,6 +32,4 @@ structopt-derive = { path = "structopt-derive", version = "0.3.2" }
 
 [dev-dependencies]
 trybuild = "1.0.5"
-version_check = "0.9"
-
-[workspace]
+rustversion = "0.1"
diff --git a/tests/macro-errors.rs b/tests/macro-errors.rs
@@ -5,17 +5,9 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 
-extern crate version_check;
-use version_check::Version;
-
+#[rustversion::attr(not(stable), ignore)]
 #[test]
 fn ui() {
     let t = trybuild::TestCases::new();
-    let version = Version::read().unwrap();
-
-    if version.at_least("1.39.0") {
-        t.compile_fail("tests/ui-1.39_post/*.rs");
-    } else {
-        t.compile_fail("tests/ui-pre_1.39/*.rs");
-    }
+    t.compile_fail("tests/ui/*.rs");
 }
diff --git a/tests/ui-1.39_post/bool_default_value.stderr b/tests/ui-1.39_post/bool_default_value.stderr
diff --git a/tests/ui-1.39_post/bool_required.stderr b/tests/ui-1.39_post/bool_required.stderr
diff --git a/tests/ui-1.39_post/flatten_and_doc.stderr b/tests/ui-1.39_post/flatten_and_doc.stderr
diff --git a/tests/ui-1.39_post/flatten_and_methods.stderr b/tests/ui-1.39_post/flatten_and_methods.stderr
diff --git a/tests/ui-1.39_post/flatten_and_parse.stderr b/tests/ui-1.39_post/flatten_and_parse.stderr
diff --git a/tests/ui-1.39_post/non_existent_attr.stderr b/tests/ui-1.39_post/non_existent_attr.stderr
diff --git a/tests/ui-1.39_post/opt_opt_nonpositional.stderr b/tests/ui-1.39_post/opt_opt_nonpositional.stderr
diff --git a/tests/ui-1.39_post/opt_vec_nonpositional.stderr b/tests/ui-1.39_post/opt_vec_nonpositional.stderr
diff --git a/tests/ui-1.39_post/option_default_value.stderr b/tests/ui-1.39_post/option_default_value.stderr
diff --git a/tests/ui-1.39_post/option_required.stderr b/tests/ui-1.39_post/option_required.stderr
diff --git a/tests/ui-1.39_post/parse_empty_try_from_os.stderr b/tests/ui-1.39_post/parse_empty_try_from_os.stderr
diff --git a/tests/ui-1.39_post/parse_function_is_not_path.stderr b/tests/ui-1.39_post/parse_function_is_not_path.stderr
diff --git a/tests/ui-1.39_post/parse_literal_spec.stderr b/tests/ui-1.39_post/parse_literal_spec.stderr
diff --git a/tests/ui-1.39_post/parse_not_zero_args.stderr b/tests/ui-1.39_post/parse_not_zero_args.stderr
diff --git a/tests/ui-1.39_post/raw.stderr b/tests/ui-1.39_post/raw.stderr
diff --git a/tests/ui-1.39_post/rename_all_wrong_casing.stderr b/tests/ui-1.39_post/rename_all_wrong_casing.stderr
diff --git a/tests/ui-1.39_post/skip_flatten.stderr b/tests/ui-1.39_post/skip_flatten.stderr
diff --git a/tests/ui-1.39_post/skip_subcommand.stderr b/tests/ui-1.39_post/skip_subcommand.stderr
diff --git a/tests/ui-1.39_post/skip_with_other_options.stderr b/tests/ui-1.39_post/skip_with_other_options.stderr
diff --git a/tests/ui-1.39_post/skip_without_default.stderr b/tests/ui-1.39_post/skip_without_default.stderr
diff --git a/tests/ui-1.39_post/struct_flatten.stderr b/tests/ui-1.39_post/struct_flatten.stderr
diff --git a/tests/ui-1.39_post/struct_parse.stderr b/tests/ui-1.39_post/struct_parse.stderr
diff --git a/tests/ui-1.39_post/struct_subcommand.stderr b/tests/ui-1.39_post/struct_subcommand.stderr
diff --git a/tests/ui-1.39_post/structopt_empty_attr.stderr b/tests/ui-1.39_post/structopt_empty_attr.stderr
diff --git a/tests/ui-1.39_post/structopt_name_value_attr.stderr b/tests/ui-1.39_post/structopt_name_value_attr.stderr
diff --git a/tests/ui-1.39_post/subcommand_and_flatten.stderr b/tests/ui-1.39_post/subcommand_and_flatten.stderr
diff --git a/tests/ui-1.39_post/subcommand_and_methods.stderr b/tests/ui-1.39_post/subcommand_and_methods.stderr
diff --git a/tests/ui-1.39_post/subcommand_and_parse.stderr b/tests/ui-1.39_post/subcommand_and_parse.stderr
diff --git a/tests/ui-1.39_post/subcommand_opt_opt.stderr b/tests/ui-1.39_post/subcommand_opt_opt.stderr
diff --git a/tests/ui-1.39_post/subcommand_opt_vec.stderr b/tests/ui-1.39_post/subcommand_opt_vec.stderr
diff --git a/tests/ui-1.39_post/tuple_struct.stderr b/tests/ui-1.39_post/tuple_struct.stderr
diff --git a/tests/ui-pre_1.39/bool_default_value.rs b/tests/ui-pre_1.39/bool_default_value.rs
diff --git a/tests/ui-pre_1.39/bool_required.rs b/tests/ui-pre_1.39/bool_required.rs
diff --git a/tests/ui-pre_1.39/flatten_and_doc.rs b/tests/ui-pre_1.39/flatten_and_doc.rs
diff --git a/tests/ui-pre_1.39/flatten_and_methods.rs b/tests/ui-pre_1.39/flatten_and_methods.rs