From b154e89c6cddf34f026dfada4f133f832331c8d9 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 29 May 2019 20:07:20 -0700 Subject: [PATCH] Fix compiletest for rebuild testing. Related: rhbz1680091 --- ...ix-compiletest-wrt.-exclude_should_p.patch | 24 +++++++++++++++++++ rust.spec | 9 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch diff --git a/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch b/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch new file mode 100644 index 0000000..7ab3801 --- /dev/null +++ b/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch @@ -0,0 +1,24 @@ +From 26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 Mon Sep 17 00:00:00 2001 +From: Mazdak Farrokhzad +Date: Mon, 15 Apr 2019 04:05:37 +0200 +Subject: [PATCH] bump bootstrap; fix compiletest wrt. exclude_should_panic + +--- + src/tools/compiletest/src/main.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs +index 9e3c49119dea..431fd7969be0 100644 +--- a/src/tools/compiletest/src/main.rs ++++ b/src/tools/compiletest/src/main.rs +@@ -523,6 +523,7 @@ pub fn run_tests(config: &Config) { + + pub fn test_opts(config: &Config) -> test::TestOpts { + test::TestOpts { ++ exclude_should_panic: false, + filter: config.filter.clone(), + filter_exact: config.filter_exact, + run_ignored: if config.run_ignored { +-- +2.21.0 + diff --git a/rust.spec b/rust.spec index 14fcf22..5fa8edb 100644 --- a/rust.spec +++ b/rust.spec @@ -49,7 +49,7 @@ Name: rust Version: 1.35.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -73,6 +73,9 @@ Patch2: 0001-Limit-internalization-in-LLVM-8-ThinLTO.patch # https://github.com/rust-lang/rust/pull/61085 Patch3: rust-pr61085-fix-ICE-with-incorrect-turbofish.patch +# https://github.com/rust-lang/rust/pull/59974/commits/26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 +Patch4: 0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch + # Get the Rust triple for any arch. %{lua: function rust_triple(arch) local abi = "gnu" @@ -396,6 +399,7 @@ test -f '%{local_rust_root}/bin/rustc' %patch1 -p1 -R %patch2 -p1 %patch3 -p1 +%patch4 -p1 %if "%{python}" == "python3" sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure @@ -679,6 +683,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Wed May 29 2019 Josh Stone - 1.35.0-2 +- Fix compiletest for rebuild testing. + * Thu May 23 2019 Josh Stone - 1.35.0-1 - Update to 1.35.0.