Group all ABI tests. #62593

kper · 2019-07-11T17:48:44Z

rust-highfive · 2019-07-11T17:48:55Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

eddyb · 2019-07-12T08:34:19Z

@kper You can write "r? @eddyb" in the PR description to make me the reviewer btw (instead of getting one randomly assigned).

eddyb · 2019-07-12T08:35:23Z

Heh GitHub is showing this as -0 +0 because files were moved without being changed.

eddyb · 2019-07-12T08:37:11Z

@kper I think I wouldn't move all of those tests, specifically not the ones in their own sub-directories (like rfcs/), other than issues/.

Other than that, this seems good.

kper · 2019-07-12T08:49:38Z

@eddyb Most of the files I moved are in subdirectories. So should I move them all back or just rfcs? :)

eddyb · 2019-07-12T08:53:52Z

Hmm, I'm less sure now. Let's see what other @rust-lang/compiler people think.

nikomatsakis · 2019-07-12T15:04:10Z

Always a challenge!

I think I would keep things that are grouped under RFCs specifically -- are there any? -- but I think tests in generic sounding directories like struct or union would be better off moving into abi (as well as run-pass).

Going forward, I want some kind of tagging system where we can include keywords, so that we have a "primary organization" which is oriented around RFCs (or, more generally, stabilization units), I think, but a "secondary organization" for more general categories.

Although, writing this out, it makes me wonder if the primary organization should rather be the "language area" or something, with tags being used to record things related to a particular stabilization unit. Well, either way. =) The bottom line is that no one hierarchy is best...

JohnCSimon · 2019-07-27T02:52:26Z

@rust-lang/compiler @nikomatsakis @kper
Hello from triage - This PR has sat idle for over half a month and is waiting on a review.

wirelessringo · 2019-08-02T21:06:44Z

Ping from triage. @eddyb any updates on this? cc @rust-lang/compiler

eddyb · 2019-08-12T10:48:27Z

r? @nikomatsakis

Centril · 2019-08-14T16:02:10Z

@kper We recently moved things out from the test/run-pass/ folder into test/ui/ -- could you please rebase and force-push so that we can be sure the diff is still OK?

nikomatsakis · 2019-08-14T20:17:17Z

r? @Centril

since he seems more up to date than I am =)

The grouping led to a lot of `mv`. Therefore, some relative paths were wrong. In this commit the dependent files were also moved so that the paths work again.

kper · 2019-08-15T09:46:02Z

@Centril ok, rebased. But the abi tests are both duplicated in run-pass and ui now.

Centril · 2019-08-15T09:50:45Z

@kper Alright, thank you. You'll need to do the same reorganization in the src/test/ui/ directory instead. Hopefully it will take less time now that you know what files to move where. Also, no files should be added to src/test/run-pass since that directory is untested.

kper · 2019-08-15T15:12:18Z

@Centril ok, I reorganized it again. This time, I did not touch rfcs and issues.

Centril · 2019-08-15T15:21:54Z

I'm also conflicted like Niko re. statics/ and similar but ultimately this seems like the better organization for all files moved here. I do agree we need a better categorization and tagging system!

@bors r+

bors · 2019-08-15T15:21:55Z

📌 Commit 4a8ff5b has been approved by Centril

rust-highfive · 2019-08-15T16:22:02Z

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-08-15T15:09:03.6734128Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-15T15:09:03.6921993Z ##[command]git config gc.auto 0
2019-08-15T15:09:03.7001146Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-15T15:09:03.7052328Z ##[command]git config --get-all http.proxy
2019-08-15T15:09:03.7191079Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/62593/merge:refs/remotes/pull/62593/merge
---
2019-08-15T15:09:38.5466418Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-15T15:09:38.5466448Z 
2019-08-15T15:09:38.5466837Z   git checkout -b <new-branch-name>
2019-08-15T15:09:38.5466864Z 
2019-08-15T15:09:38.5466923Z HEAD is now at b69b5fdea Merge 4a8ff5bb7c31c90a5be3e4d6a2e7e7211b4c8745 into 1cdcea920e56a5d0587307a4c9cf8fff5c77c4bc
2019-08-15T15:09:38.5656682Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-15T15:09:38.5659765Z ==============================================================================
2019-08-15T15:09:38.5659840Z Task         : Bash
2019-08-15T15:09:38.5659887Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-15T16:08:39.0692653Z     Finished release [optimized] target(s) in 1m 33s
2019-08-15T16:08:39.0959268Z Check compiletest suite=ui mode=ui (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-15T16:08:39.5415545Z 
2019-08-15T16:08:39.5416027Z running 8920 tests
2019-08-15T16:08:44.8005739Z ....................................FERROR 2019-08-15T16:08:44Z: compiletest::runtest: fatal error, panic: "aux-build `/checkout/src/test/ui/abi/proc-macro/auxiliary/test-macros.rs` source not found"
2019-08-15T16:09:06.5850764Z .................................................................................................... 200/8920
2019-08-15T16:09:15.0214254Z .................................................................................................... 300/8920
2019-08-15T16:09:26.5375611Z .................................................................................................... 400/8920
2019-08-15T16:09:39.4117038Z .................................................................i.................................. 500/8920
---
2019-08-15T16:10:50.5978655Z .................................................................................................... 1500/8920
2019-08-15T16:10:56.3757099Z .................................................................................................... 1600/8920
2019-08-15T16:11:09.8143412Z ..............................i...............i..................................................... 1700/8920
2019-08-15T16:11:18.4136883Z .................................................................................................... 1800/8920
2019-08-15T16:11:32.3973977Z .....................iiiii.......................................................................... 1900/8920
2019-08-15T16:11:43.5450682Z .................................................................................................... 2100/8920
2019-08-15T16:11:46.2596118Z .................................................................................................... 2200/8920
2019-08-15T16:11:51.3244636Z .................................................................................................... 2300/8920
2019-08-15T16:11:58.5895071Z .................................................................................................... 2400/8920
---
2019-08-15T16:14:56.6800814Z .................................................................................................... 4600/8920
2019-08-15T16:15:04.0647501Z ..i...............i................................................................................. 4700/8920
2019-08-15T16:15:15.4379315Z .................................................................................................... 4800/8920
2019-08-15T16:15:21.3688645Z .................................................................................................... 4900/8920
2019-08-15T16:15:33.4880206Z ..................................................................................ii.ii............. 5000/8920
2019-08-15T16:15:43.3954338Z .................................................................................................... 5200/8920
2019-08-15T16:15:53.2818371Z .................................................................................................... 5300/8920
2019-08-15T16:16:00.8648847Z ......................................i............................................................. 5400/8920
2019-08-15T16:16:07.3320977Z .................................................................................................... 5500/8920
2019-08-15T16:16:07.3320977Z .................................................................................................... 5500/8920
2019-08-15T16:16:19.3213328Z .................................................................................................... 5600/8920
2019-08-15T16:16:32.1343746Z ...............................ii...i..ii...........i............................................... 5700/8920
2019-08-15T16:16:51.2853652Z .................................................................................................... 5900/8920
2019-08-15T16:16:56.1647565Z .................................................................................................... 6000/8920
2019-08-15T16:16:56.1647565Z .................................................................................................... 6000/8920
2019-08-15T16:17:10.4503070Z ................................i..ii............................................................... 6100/8920
2019-08-15T16:17:31.0783927Z ..........................................................................i......................... 6300/8920
2019-08-15T16:17:33.3852330Z .................................................................................................... 6400/8920
2019-08-15T16:17:35.8227470Z ..............................................i..................................................... 6500/8920
2019-08-15T16:17:39.4044539Z .................................................................................................... 6600/8920
---
2019-08-15T16:21:40.1565940Z failures:
2019-08-15T16:21:40.1565975Z 
2019-08-15T16:21:40.1566579Z ---- [ui] ui/abi/proc-macro/macros-in-extern.rs stdout ----
2019-08-15T16:21:40.1566611Z 
2019-08-15T16:21:40.1567037Z error: aux-build `/checkout/src/test/ui/abi/proc-macro/auxiliary/test-macros.rs` source not found
2019-08-15T16:21:40.1567599Z thread '[ui] ui/abi/proc-macro/macros-in-extern.rs' panicked at 'fatal error', src/tools/compiletest/src/runtest.rs:2230:9
2019-08-15T16:21:40.1567692Z 
2019-08-15T16:21:40.1567716Z 
2019-08-15T16:21:40.1567772Z failures:
2019-08-15T16:21:40.1567983Z     [ui] ui/abi/proc-macro/macros-in-extern.rs
2019-08-15T16:21:40.1567983Z     [ui] ui/abi/proc-macro/macros-in-extern.rs
2019-08-15T16:21:40.1568013Z 
2019-08-15T16:21:40.1568338Z test result: FAILED. 8882 passed; 1 failed; 37 ignored; 0 measured; 0 filtered out
2019-08-15T16:21:40.1568392Z 
2019-08-15T16:21:40.1656998Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-08-15T16:21:40.1666061Z 
2019-08-15T16:21:40.1667004Z 
2019-08-15T16:21:40.1672779Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-08-15T16:21:40.1673104Z 
2019-08-15T16:21:40.1673138Z 
2019-08-15T16:21:40.1684458Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-15T16:21:40.1684552Z Build completed unsuccessfully in 1:05:08
2019-08-15T16:21:40.1684552Z Build completed unsuccessfully in 1:05:08
2019-08-15T16:21:40.1739491Z == clock drift check ==
2019-08-15T16:21:40.1757462Z   local time: Thu Aug 15 16:21:40 UTC 2019
2019-08-15T16:21:40.3324444Z   network time: Thu, 15 Aug 2019 16:21:40 GMT
2019-08-15T16:21:40.3328103Z == end clock drift check ==
2019-08-15T16:21:41.2153788Z ##[error]Bash exited with code '1'.
2019-08-15T16:21:41.2196912Z ##[section]Starting: Checkout
2019-08-15T16:21:41.2198476Z ==============================================================================
2019-08-15T16:21:41.2198521Z Task         : Get sources
2019-08-15T16:21:41.2198577Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Centril · 2019-08-15T16:23:45Z

@bors r- ^--

kper · 2019-08-15T17:29:53Z

@Centril because proc-macro was split up into normal and abi test, each requires this auxiliary/test_macros.rs file. I just copied the file to abi/proc-macro/auxiliary/test_macros.rs. Is this ok?

Centril · 2019-08-15T17:34:02Z

I think so yeah.

Centril · 2019-08-15T21:55:45Z

@bors r+

bors · 2019-08-15T21:55:46Z

📌 Commit 26ee99e has been approved by Centril

@eddyb

Group all ABI tests. r? @eddyb Closes rust-lang#62401

@eddyb

Group all ABI tests. r? @eddyb Closes rust-lang#62401

@ghost

Rollup of 7 pull requests Successful merges: - #62593 (Group all ABI tests.) - #63173 (Use libunwind from llvm-project submodule for musl targets) - #63535 (Continue refactoring resolve and hygiene) - #63539 (Suggest Rust 2018 on `<expr>.await` with no such field) - #63584 (libcore: more cleanups using `#![feature(associated_type_bounds)]`) - #63612 (Do not suggest `try_into` for base types inside of macro expansions) - #63615 (Fix typo in DoubleEndedIterator::nth_back doc) Failed merges: r? @ghost

petrochenkov · 2019-08-28T22:03:47Z

The macro tests are not about ABI at all, I'm going to move them back into their old place.

rust-highfive assigned nikomatsakis Jul 11, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2019

rust-highfive assigned eddyb and unassigned nikomatsakis Jul 12, 2019

JohnCSimon added the S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). label Jul 27, 2019

rust-highfive assigned nikomatsakis and unassigned eddyb Aug 12, 2019

rust-highfive assigned Centril and unassigned nikomatsakis Aug 14, 2019

kper added 3 commits August 15, 2019 11:37

Grouping ABI test #62401

f036fae

Grouping ABI tests (2) #62401

98325eb

Fixing broken tests #62401

cac53fe

The grouping led to a lot of `mv`. Therefore, some relative paths were wrong. In this commit the dependent files were also moved so that the paths work again.

kper added 3 commits August 15, 2019 16:00

Group all ui tests and move to abi #62593

df713dd

Move test-macros.rs back to ui to fix tests #62593

a90d087

Remove run-pass directory #62593

4a8ff5b

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 15, 2019

Duplicate test-macros.rs to fix test #62593

26ee99e

Centril added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 15, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 15, 2019

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#62593 - kper:cleanup_abi, r=Centril

aa3f542

Group all ABI tests. r? @eddyb Closes rust-lang#62401

Centril mentioned this pull request Aug 15, 2019

Rollup of 7 pull requests #63617

Closed

Centril added a commit to Centril/rust that referenced this pull request Aug 16, 2019

Rollup merge of rust-lang#62593 - kper:cleanup_abi, r=Centril

100a02a

Group all ABI tests. r? @eddyb Closes rust-lang#62401

Centril mentioned this pull request Aug 16, 2019

Rollup of 7 pull requests #63627

Merged

bors merged commit 26ee99e into rust-lang:master Aug 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Group all ABI tests. #62593

Group all ABI tests. #62593

kper commented Jul 11, 2019 •

edited

Loading

rust-highfive commented Jul 11, 2019

eddyb commented Jul 12, 2019

eddyb commented Jul 12, 2019

eddyb commented Jul 12, 2019

kper commented Jul 12, 2019

eddyb commented Jul 12, 2019

nikomatsakis commented Jul 12, 2019

JohnCSimon commented Jul 27, 2019

wirelessringo commented Aug 2, 2019

eddyb commented Aug 12, 2019

Centril commented Aug 14, 2019

nikomatsakis commented Aug 14, 2019

kper commented Aug 15, 2019

Centril commented Aug 15, 2019

kper commented Aug 15, 2019

Centril commented Aug 15, 2019

bors commented Aug 15, 2019

rust-highfive commented Aug 15, 2019

Centril commented Aug 15, 2019

kper commented Aug 15, 2019 •

edited

Loading

Centril commented Aug 15, 2019

Centril commented Aug 15, 2019

bors commented Aug 15, 2019

petrochenkov commented Aug 28, 2019

Group all ABI tests. #62593

Group all ABI tests. #62593

Conversation

kper commented Jul 11, 2019 • edited Loading

rust-highfive commented Jul 11, 2019

eddyb commented Jul 12, 2019

eddyb commented Jul 12, 2019

eddyb commented Jul 12, 2019

kper commented Jul 12, 2019

eddyb commented Jul 12, 2019

nikomatsakis commented Jul 12, 2019

JohnCSimon commented Jul 27, 2019

wirelessringo commented Aug 2, 2019

eddyb commented Aug 12, 2019

Centril commented Aug 14, 2019

nikomatsakis commented Aug 14, 2019

kper commented Aug 15, 2019

Centril commented Aug 15, 2019

kper commented Aug 15, 2019

Centril commented Aug 15, 2019

bors commented Aug 15, 2019

rust-highfive commented Aug 15, 2019

Centril commented Aug 15, 2019

kper commented Aug 15, 2019 • edited Loading

Centril commented Aug 15, 2019

Centril commented Aug 15, 2019

bors commented Aug 15, 2019

petrochenkov commented Aug 28, 2019

kper commented Jul 11, 2019 •

edited

Loading

kper commented Aug 15, 2019 •

edited

Loading