mirror of
https://abf.rosa.ru/djam/rust.git
synced 2025-02-23 09:52:52 +00:00
Updated to 1.43.1
This commit is contained in:
parent
b0486c5051
commit
9a16cd4a4d
3 changed files with 62 additions and 3 deletions
2
.abf.yml
2
.abf.yml
|
@ -2,4 +2,4 @@ sources:
|
|||
rust-1.42.0-aarch64-unknown-linux-gnu.tar.xz: 985d3b7d2a2ebcd09415f2d2702d8b18b9d038f1
|
||||
rust-1.42.0-i686-unknown-linux-gnu.tar.xz: 3b740f05be16327820b64f4b4ff9ec3d0f005e54
|
||||
rust-1.42.0-x86_64-unknown-linux-gnu.tar.xz: ebb8fe2ac0459229f8aa89e153e831bd2d506018
|
||||
rustc-1.43.0-src.tar.xz: 685cb48f76a47cda65d0a0c1da85bfe61e1a8cc0
|
||||
rustc-1.43.1-src.tar.xz: 24243dbbeb70be8370fddc4a83e68a1ad228c4ed
|
||||
|
|
56
rust-pr71782-Use-a-non-existent-test-path.patch
Normal file
56
rust-pr71782-Use-a-non-existent-test-path.patch
Normal file
|
@ -0,0 +1,56 @@
|
|||
From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <jistone@redhat.com>
|
||||
Date: Fri, 1 May 2020 16:50:10 -0700
|
||||
Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null
|
||||
|
||||
---
|
||||
src/test/ui/non-ice-error-on-worker-io-fail.rs | 10 +++++++---
|
||||
src/test/ui/non-ice-error-on-worker-io-fail.stderr | 2 +-
|
||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
index 8af17742850d..30779fc65c0f 100644
|
||||
--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
@@ -4,8 +4,12 @@
|
||||
//
|
||||
// An attempt to `-o` into a directory we cannot write into should indeed
|
||||
// be an error; but not an ICE.
|
||||
+//
|
||||
+// However, some folks run tests as root, which can write `/dev/` and end
|
||||
+// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
|
||||
+// also used to ICE, but even root can't magically write there.
|
||||
|
||||
-// compile-flags: -o /dev/null
|
||||
+// compile-flags: -o /does-not-exist/output
|
||||
|
||||
// The error-pattern check occurs *before* normalization, and the error patterns
|
||||
// are wildly different between build environments. So this is a cop-out (and we
|
||||
@@ -15,10 +19,10 @@
|
||||
// error-pattern: error
|
||||
|
||||
// On Mac OS X, we get an error like the below
|
||||
-// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
|
||||
+// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/"
|
||||
|
||||
// On Linux, we get an error like the below
|
||||
-// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
|
||||
+// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"
|
||||
|
||||
// ignore-tidy-linelength
|
||||
// ignore-windows - this is a unix-specific test
|
||||
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
index f732abc52b71..edadecf273a7 100644
|
||||
--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
@@ -1,6 +1,6 @@
|
||||
warning: ignoring --out-dir flag due to -o flag
|
||||
|
||||
-error: io error modifying /dev/
|
||||
+error: io error modifying /does-not-exist/
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -65,8 +65,8 @@
|
|||
|
||||
Summary: The Rust Programming Language
|
||||
Name: rust
|
||||
Version: 1.43.0
|
||||
Release: 2
|
||||
Version: 1.43.1
|
||||
Release: 1
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
Group: Development/Rust
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
|
@ -88,6 +88,8 @@ Patch3: rust-pr70591-ensure-llvm-is-in-the-link-path.patch
|
|||
# Prepare for LLVM 10 upgrade
|
||||
# https://github.com/rust-lang/rust/pull/70163
|
||||
Patch4: rust-pr70163-prepare-for-llvm-10-upgrade.patch
|
||||
# https://github.com/rust-lang/rust/pull/71782
|
||||
Patch5: rust-pr71782-Use-a-non-existent-test-path.patch
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: curl
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
|
@ -376,6 +378,7 @@ test -f '%{local_rust_root}/bin/rustc'
|
|||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
# python3
|
||||
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
|
||||
|
|
Loading…
Add table
Reference in a new issue