Fix compiletest for rebuild testing.
Related: rhbz1680091
This commit is contained in:
parent
3edbbaee75
commit
b154e89c6c
@ -0,0 +1,24 @@
|
|||||||
|
From 26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mazdak Farrokhzad <twingoow@gmail.com>
|
||||||
|
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
|
||||||
|
|
@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
Name: rust
|
Name: rust
|
||||||
Version: 1.35.0
|
Version: 1.35.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: The Rust Programming Language
|
Summary: The Rust Programming Language
|
||||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||||
# ^ written as: (rust itself) and (bundled libraries)
|
# ^ 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
|
# https://github.com/rust-lang/rust/pull/61085
|
||||||
Patch3: rust-pr61085-fix-ICE-with-incorrect-turbofish.patch
|
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.
|
# Get the Rust triple for any arch.
|
||||||
%{lua: function rust_triple(arch)
|
%{lua: function rust_triple(arch)
|
||||||
local abi = "gnu"
|
local abi = "gnu"
|
||||||
@ -396,6 +399,7 @@ test -f '%{local_rust_root}/bin/rustc'
|
|||||||
%patch1 -p1 -R
|
%patch1 -p1 -R
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%if "%{python}" == "python3"
|
%if "%{python}" == "python3"
|
||||||
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
|
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
|
||||||
@ -679,6 +683,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 29 2019 Josh Stone <jistone@redhat.com> - 1.35.0-2
|
||||||
|
- Fix compiletest for rebuild testing.
|
||||||
|
|
||||||
* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
|
* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
|
||||||
- Update to 1.35.0.
|
- Update to 1.35.0.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user