beta test
This commit is contained in:
Josh Stone
parent
8429f906ad
commit
09f0f09852
|
|
@ -1,56 +0,0 @@
|
|||
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; 1 warning emitted
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
23
rust.spec
23
rust.spec
|
|
@ -9,10 +9,10 @@
|
|||
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
||||
# or nightly wants some beta-YYYY-MM-DD
|
||||
# Note that cargo matches the program version here, not its crate version.
|
||||
%global bootstrap_rust 1.43.1
|
||||
%global bootstrap_cargo 1.43.1
|
||||
%global bootstrap_channel 1.43.1
|
||||
%global bootstrap_date 2020-05-07
|
||||
%global bootstrap_rust 1.44.0
|
||||
%global bootstrap_cargo 1.44.0
|
||||
%global bootstrap_channel 1.44.0
|
||||
%global bootstrap_date 2020-06-04
|
||||
|
||||
# Only the specified arches will use bootstrap binaries.
|
||||
#global bootstrap_arches %%{rust_arches}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
%bcond_with llvm_static
|
||||
|
||||
# We can also choose to just use Rust's bundled LLVM, in case the system LLVM
|
||||
# is insufficient. Rust currently requires LLVM 7.0+.
|
||||
# is insufficient. Rust currently requires LLVM 8.0+.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
%bcond_without bundled_llvm
|
||||
%else
|
||||
|
|
@ -48,8 +48,8 @@
|
|||
%endif
|
||||
|
||||
Name: rust
|
||||
Version: 1.44.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.46.0
|
||||
Release: 0.1.beta.3%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
|
|
@ -63,9 +63,6 @@ ExclusiveArch: %{rust_arches}
|
|||
%endif
|
||||
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
|
||||
|
||||
# https://github.com/rust-lang/rust/pull/71782
|
||||
Patch1: rust-pr71782-Use-a-non-existent-test-path.patch
|
||||
|
||||
# Get the Rust triple for any arch.
|
||||
%{lua: function rust_triple(arch)
|
||||
local abi = "gnu"
|
||||
|
|
@ -146,7 +143,7 @@ BuildRequires: %{python}
|
|||
|
||||
%if %with bundled_llvm
|
||||
BuildRequires: cmake3 >= 3.4.3
|
||||
Provides: bundled(llvm) = 9.0.1
|
||||
Provides: bundled(llvm) = 10.0.1
|
||||
%else
|
||||
BuildRequires: cmake >= 2.8.11
|
||||
%if 0%{?epel}
|
||||
|
|
@ -394,8 +391,6 @@ test -f '%{local_rust_root}/bin/rustc'
|
|||
|
||||
%setup -q -n %{rustc_package}
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
%if "%{python}" == "python3"
|
||||
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
|
||||
%endif
|
||||
|
|
@ -506,6 +501,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
|
|||
--disable-rpath \
|
||||
%{enable_debuginfo} \
|
||||
--enable-extended \
|
||||
--tools=analysis,cargo,clippy,rls,rustfmt,src \
|
||||
--enable-vendor \
|
||||
--enable-verbose-tests \
|
||||
%{?codegen_units_std} \
|
||||
|
|
@ -613,7 +609,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
|||
%dir %{rustlibdir}/%{rust_triple}
|
||||
%dir %{rustlibdir}/%{rust_triple}/lib
|
||||
%{rustlibdir}/%{rust_triple}/lib/*.so
|
||||
%exclude %{_bindir}/*miri
|
||||
|
||||
|
||||
%files std-static
|
||||
|
|
|
|||
Loading…
Reference in New Issue