rustc: 1.25.0 -> 1.26.2 #40356
Merged
rustc: 1.25.0 -> 1.26.2 #40356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mic92
reviewed
May 11, 2018
| @@ -26,10 +26,7 @@ in rec { | |||
| # 2. Tests run out of memory for i686 | |||
| doCheck = !stdenv.isAarch64 && !stdenv.isi686; | |||
|
|
|||
| patches = [ | |||
| ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch | |||
There was a problem hiding this comment.
Well, the sources changed. Not sure how to fix them.
LnL7
reviewed
May 11, 2018
There was a problem hiding this comment.
x86-64_linux build failed
<3>LD_LIBRARY_PATH="/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/lib:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib:" '/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu -L /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu -Zrelro-level=partial hello.rs
<3>readelf -l /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu/hello | grep -q GNU_RELRO
<3># Ensure that we're *not* built with RELRO when setting it to off. We do
<3># not want to check for BIND_NOW however, as the linker might have that
<3># enabled by default.
<3>LD_LIBRARY_PATH="/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/lib:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib:" '/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu -L /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu -Zrelro-level=off hello.rs
<3>! readelf -l /build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/relro-levels.stage2-x86_64-unknown-linux-gnu/hello | grep -q GNU_RELRO
<3>make[1]: Leaving directory '/build/rustc-1.26.0-src/src/test/run-make-fulldeps/relro-levels'
<3>
<3>------------------------------------------
<3>stderr:
<3>------------------------------------------
<3>make[1]: *** [Makefile:18: all] Error 1
<3>
<3>------------------------------------------
<3>
<3>thread '[run-make] run-make-fulldeps/relro-levels' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:2901:9
<3>note: Run with `RUST_BACKTRACE=1` for a backtrace.
<3>
<3>
<3>failures:
<3> [run-make] run-make-fulldeps/relro-levels
<3>
<3>test result: FAILED. 179 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
<3>
<3>thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:478:22
<3>
<3>
<3>command did not execute successfully: "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/build/rustc-1.26.0-src/src/test/run-make-fulldeps" "--build-base" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zmiri -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zmiri -Zunstable-options -Lnative=/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python2.7" "--lldb-python" "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python2.7" "--gdb" "/nix/store/xcvbwflwll9nknj8rz1k0972xzh2wpgv-gdb-8.1/bin/gdb" "--verbose" "--llvm-version" "6.0.0\n" "--cc" "gcc" "--cxx" "g++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64asmprinter aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils all all-targets analysis arm armasmparser armasmprinter armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mips mipsasmparser mipsasmprinter mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmprinter msp430codegen msp430desc msp430info native nativecodegen nvptx nvptxasmprinter nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpcasmprinter powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata runtimedyld scalaropts selectiondag sparc sparcasmparser sparcasmprinter sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzasmprinter systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport transformutils vectorize webassembly webassemblyasmprinter webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils" "--llvm-cxxflags" "-I/build/rustc-1.26.0-src/src/llvm/include -I/build/rustc-1.26.0-src/build/x86_64-unknown-linux-gnu/llvm/build/include -ffunction-sections -fdata-sections -fPIC -m64 -fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -ffunction-sections -fdata-sections -O3 -DNDEBUG -fno-exceptions -fno-rtti -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" ""
<3>expected success, got: exit code: 101
<3>
<3>
<3>Traceback (most recent call last):
<3> File "/build/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 817, in <module>
<3> main()
<3> File "/build/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 800, in main
<3> bootstrap(help_triggered)
<3> File "/build/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 791, in bootstrap
<3> run(args, env=env, verbose=build.verbose)
<3> File "/build/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 148, in run
<3> raise RuntimeError(err)
<3>RuntimeError: failed to run: /build/rustc-1.26.0-src/build/bootstrap/debug/bootstrap test --jobs 4 -v
<3>make: *** [Makefile:58: check] Error 1
<3>builder for '/nix/store/s7r940ibji6bwhwkwmi6w0czrgznclkf-rustc-1.26.0.drv' failed with exit code 2
|
Yup, that's the error I got. Test code. I can't really see how NixOS would affect this however... Nor what I'd do to fix it. Lemme google around |
|
I'm guessing this is because of the default NixOS hardening... So it's intended behavior? Or should there be a rust wrapper that disables the relro thing by default? |
|
Maybe we could disable hardening flags for the tests? |
|
|
|
I'm not entirely sure how to disable hardening for only tests... but hopefully I did it correctly now. |
|
@Mic92 should this go to staging? |
LnL7
reviewed
May 12, 2018
There was a problem hiding this comment.
x86_64-darwin build failure
test time.rs - time::Duration::subsec_millis (line 219) ... ok
test time.rs - time::Duration::subsec_nanos (line 259) ... ok
test unit.rs - unit::() (line 18) ... ok
failures:
---- ../stdsimd/coresimd/x86/mod.rs - coresimd::x86::__m256 (line 32) stdout ----
thread 'rustc' panicked at 'test executable failed:
', librustdoc/test.rs:341:17
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
../stdsimd/coresimd/x86/mod.rs - coresimd::x86::__m256 (line 32)
test result: FAILED. 1596 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out
error: test failed, to rerun pass '--doc'
command did not execute successfully: "/nix/store/dkdmn9h4irdd0373xv4xwns1b6x58jhv-rustc-bootstrap-1.25.0/bin/cargo" "test" "--target" "x86_64-apple-darwin" "--release" "--frozen" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/src/libstd/Cargo.toml" "-p" "core" "--"
expected success, got: exit code: 101
Traceback (most recent call last):
File "/private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 817, in <module>
main()
File "/private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 800, in main
bootstrap(help_triggered)
File "/private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 791, in bootstrap
run(args, env=env, verbose=build.verbose)
File "/private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/src/bootstrap/bootstrap.py", line 148, in run
raise RuntimeError(err)
RuntimeError: failed to run: /private/tmp/nix-build-rustc-1.26.0.drv-0/rustc-1.26.0-src/build/bootstrap/debug/bootstrap test --jobs 4 -v
make: *** [Makefile:58: check] Error 1
builder for '/nix/store/wrmkfjspmxzwny16j5wm4jagnqpqis4w-rustc-1.26.0.drv' failed with exit code 2
|
@xeji I would say yes, but staging is in a pretty bad spot right now. I'll try to take a look at the darwin failure tomorrow. |
|
I have to run a test build on aarch64 before we merge. I also would like to see the tcp test we have disabled to be disabled again to avoid random hydra build failures. |
|
wrong button |
|
The x86 tests on macOS fail in this example: https://github.com/rust-lang-nursery/stdsimd/blob/master/coresimd/x86/mod.rs#L36 |
jD91mZM2
force-pushed
the
rust
branch
2 times, most recently
from
16322fa to
5df0e7f
Compare
|
I have re-patched the tests on darwin now :) As for the error, I'm really not sure. According to your stack trace the commands didn't leave any sort of error in STDOUT/STDERR... |
Mic92
reviewed
May 13, 2018
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "linux", ignore)] | ||
| + #[cfg_attr(target_os = "macos", ignore)] |
There was a problem hiding this comment.
This one should be linux unless something has changed.
|
@LnL7 probably take a look at the macOS error later. |
|
Any progress on this? |
Mic92
approved these changes
May 19, 2018
|
I started my x86_64 test build again... |
Mic92
reviewed
Jun 5, 2018
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "linux", ignore)] |
|
@Mic92 That fails like this, but also isn't using the version from the compiler. |
GrahamcOfBorg
added
the
8.has: documentation
- disable doctest for stdsimd - disable previous and some extra extra tcp tests
|
Nice, thanks for taking care of this! |
|
Sorry for the delay, I'm running another build with my last changes. I will merge if that didn't break anything. |
|
The x86_64 build went successfully (before you applied the patch, but disabling test should not change anything). I will start the arm64 build now. |
|
the bootstrap tarball on aarch64 currently comes without rust-docs installed. |
|
Probably we can disable rust-docs for all targets, if it is not needed for bootstrapping. |
|
The following fixed the rust build on aarch64: diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 1904c12dfdc..849917c4a0c 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -14,7 +14,7 @@ let
installComponents
= "rustc,rust-std-${platform}"
- + (optionalString bootstrapping ",rust-docs,cargo")
+ + (optionalString bootstrapping ",cargo")
;
in |
|
Oh right, that makes sense, I saw some issue with rustup some time ago that was because of broken rust docs for certain platforms or something. Might be something similar here! |
Mic92
reviewed
Jun 6, 2018
| } | ||
|
|
||
| #[test] | ||
| + #[cfg_attr(target_os = "linux", target_os = "macos", ignore)] |
There was a problem hiding this comment.
This should be:
#[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)]
There was a problem hiding this comment.
@LnL7 did you were able to build rust before you introduced this syntax error?
There was a problem hiding this comment.
Yeah, I messed up the conditional afterwards. Checking 1.26.2 now.
|
I also started yet another build for both x86_64 and arm64 linux. |
|
I already tested x86 |
LnL7
approved these changes
Jun 7, 2018
|
rustc failed on x86_64-linux on Hydra (https://hydra.nixos.org/build/75678845): |
|
@Mic92 had noted that rustc 1.25 was failing at the same test |
|
Mic92@54ef19a will disable it. |
|
now also pushed to master: 4752959 |
|
It looks like this Rust bug: rust-lang/rust#42795. I have reported that it was not fixed: rust-lang/rust#42795 (comment) |
|
@Mic92 btw. we should probably also send rust to staging next time, the rebuild count is getting pretty large now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Warning: I probably did this completely incorrectly. Please check extra carefully.
One test fails when trying to build this locally, but it looks unrelated.