Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake #127338

Oneirical · 2024-07-04T21:05:32Z

Part of #121876 and the associated Google Summer of Code project.

Please try:

try-job: armhf-gnu
// try-job: test-various // already tried
try-job: x86_64-msvc
try-job: aarch64-apple

rustbot · 2024-07-04T21:05:39Z

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-07-04T21:05:41Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

jieyouxu · 2024-07-05T03:16:05Z

I'll take a look at this PR a bit later today.
@bors delegate+ (for try jobs)

bors · 2024-07-05T03:16:08Z

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

Oneirical · 2024-07-05T20:01:41Z

@bors try

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: test-various

bors · 2024-07-05T20:07:27Z

⌛ Trying commit b0174d3 with merge 0a4d9df...

bors · 2024-07-05T21:07:24Z

☀️ Try build successful - checks-actions
Build commit: 0a4d9df (0a4d9dfcccd8d805aafc8d3b7ea1ffe0a31840cf)

jieyouxu

Looks good! r=me if try jobs come back green.

jieyouxu · 2024-07-06T05:00:51Z

tests/run-make/extra-filename-with-temp-outputs/rmake.rs

+// are named as expected.
+// See https://github.com/rust-lang/rust/pull/15686
+
+//FIXME(Oneirical): ignore-cross-compile


Suggestion: remove this FIXME if try job comes back green since it seems to work

I think this is not yet addressed.

jieyouxu · 2024-07-06T05:01:03Z

@bors try

jieyouxu · 2024-07-06T05:45:46Z

@bors try pretty pleasse

bors · 2024-07-06T05:46:56Z

⌛ Trying commit b0174d3 with merge 5f182c8...

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: armhf-gnu // try-job: test-various // already tried try-job: x86_64-msvc try-job: aarch64-apple

bors · 2024-07-06T06:46:17Z

💔 Test failed - checks-actions

Oneirical · 2024-07-08T15:54:01Z

I have a strong suspicion that target(target()) is breaking things again. @bors try

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: armhf-gnu // try-job: test-various // already tried try-job: x86_64-msvc try-job: aarch64-apple

bors · 2024-07-08T15:55:12Z

⌛ Trying commit 0df8410 with merge dac096a...

bors · 2024-07-08T17:27:55Z

☀️ Try build successful - checks-actions
Build commit: dac096a (dac096affd68ebf0c675ccdaa4fef809e67c6d74)

Oneirical · 2024-07-08T17:31:19Z

There we go. @rustbot review

jieyouxu

Thank you, just an outdated FIXME, r=me after removing it alongside a rebase.

jieyouxu · 2024-07-12T05:58:26Z

src/tools/run-make-support/src/lib.rs

+/// Returns true if the filename at `path` ends with `suffix`.
+pub fn has_suffix<P: AsRef<Path>>(path: P, suffix: &str) -> bool {
+    path.as_ref().file_name().is_some_and(|name| name.to_str().unwrap().ends_with(suffix))
+}


Question: does this addition conflict with any other PR?

No other PR has has_suffix, it's just for this PR.

jieyouxu · 2024-07-12T05:58:43Z

tests/run-make/extra-filename-with-temp-outputs/rmake.rs

+// are named as expected.
+// See https://github.com/rust-lang/rust/pull/15686
+
+//FIXME(Oneirical): ignore-cross-compile


I think this is not yet addressed.

jieyouxu · 2024-07-12T05:59:56Z

@rustbot author

Oneirical · 2024-07-12T14:47:19Z

@bors r=@jieyouxu

bors · 2024-07-12T14:47:21Z

📌 Commit c6cdbe6 has been approved by jieyouxu

It is now in the queue for this repository.

…kingjubilee Rollup of 11 pull requests Successful merges: - rust-lang#126502 (Ignore allocation bytes in some mir-opt tests) - rust-lang#126922 (add lint for inline asm labels that look like binary) - rust-lang#127209 (Added the `xop` target-feature and the `xop_target_feature` feature gate) - rust-lang#127310 (Fix import suggestion ice) - rust-lang#127338 (Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake) - rust-lang#127381 (Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake) - rust-lang#127535 (Fire unsafe_code lint on unsafe extern blocks) - rust-lang#127619 (Suggest using precise capturing for hidden type that captures region) - rust-lang#127631 (Remove `fully_normalize`) - rust-lang#127632 (Implement `precise_capturing` support for rustdoc) - rust-lang#127660 (Rename the internal `const_strlen` to just `strlen`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#127338 - Oneirical:ready-your-arbatests, r=jieyouxu Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: armhf-gnu // try-job: test-various // already tried try-job: x86_64-msvc try-job: aarch64-apple

rustbot assigned jieyouxu Jul 4, 2024

jieyouxu mentioned this pull request Jul 5, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Open

Oneirical force-pushed the ready-your-arbatests branch from 4d359cc to b0174d3 Compare July 5, 2024 14:05

This comment was marked as outdated.

Sign in to view

jieyouxu approved these changes Jul 6, 2024

View reviewed changes

jieyouxu reviewed Jul 6, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2024

Oneirical force-pushed the ready-your-arbatests branch from b0174d3 to 0df8410 Compare July 8, 2024 15:53

rustbot 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 Jul 8, 2024

jieyouxu approved these changes Jul 12, 2024

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 12, 2024

Oneirical force-pushed the ready-your-arbatests branch from 0df8410 to b35e899 Compare July 12, 2024 14:44

Oneirical added 2 commits July 12, 2024 10:45

rewrite extra-filename-with-temp-outputs to rmake

cef8a04

rewrite and rename issue-85019-moved-src-dir to rmake

c6cdbe6

Oneirical force-pushed the ready-your-arbatests branch from b35e899 to c6cdbe6 Compare July 12, 2024 14:45

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 12, 2024

workingjubilee mentioned this pull request Jul 12, 2024

Rollup of 11 pull requests #127665

Merged

bors merged commit 6cdef05 into rust-lang:master Jul 13, 2024
6 checks passed

rustbot added this to the 1.81.0 milestone Jul 13, 2024

Oneirical deleted the ready-your-arbatests branch July 14, 2024 12:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake #127338

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake #127338

Oneirical commented Jul 4, 2024 •

edited by jieyouxu

Loading

rustbot commented Jul 4, 2024

rustbot commented Jul 4, 2024

jieyouxu commented Jul 5, 2024

bors commented Jul 5, 2024

Oneirical commented Jul 5, 2024

bors commented Jul 5, 2024

bors commented Jul 5, 2024

This comment was marked as outdated.

jieyouxu left a comment

jieyouxu Jul 6, 2024

jieyouxu Jul 12, 2024

jieyouxu commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

This comment has been minimized.

bors commented Jul 6, 2024

Oneirical commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

Oneirical commented Jul 8, 2024

jieyouxu left a comment •

edited

Loading

jieyouxu Jul 12, 2024

Oneirical Jul 12, 2024

jieyouxu Jul 12, 2024

jieyouxu commented Jul 12, 2024

Oneirical commented Jul 12, 2024

bors commented Jul 12, 2024

Migrate extra-filename-with-temp-outputs and issue-85019-moved-src-dir run-make tests to rmake #127338

Migrate extra-filename-with-temp-outputs and issue-85019-moved-src-dir run-make tests to rmake #127338

Conversation

Oneirical commented Jul 4, 2024 • edited by jieyouxu Loading

rustbot commented Jul 4, 2024

rustbot commented Jul 4, 2024

jieyouxu commented Jul 5, 2024

bors commented Jul 5, 2024

Oneirical commented Jul 5, 2024

bors commented Jul 5, 2024

bors commented Jul 5, 2024

This comment was marked as outdated.

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu Jul 6, 2024

Choose a reason for hiding this comment

jieyouxu Jul 12, 2024

Choose a reason for hiding this comment

jieyouxu commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

This comment has been minimized.

bors commented Jul 6, 2024

Oneirical commented Jul 8, 2024

bors commented Jul 8, 2024

bors commented Jul 8, 2024

Oneirical commented Jul 8, 2024

jieyouxu left a comment • edited Loading

Choose a reason for hiding this comment

jieyouxu Jul 12, 2024

Choose a reason for hiding this comment

Oneirical Jul 12, 2024

Choose a reason for hiding this comment

jieyouxu Jul 12, 2024

Choose a reason for hiding this comment

jieyouxu commented Jul 12, 2024

Oneirical commented Jul 12, 2024

bors commented Jul 12, 2024

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake #127338

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake #127338

Oneirical commented Jul 4, 2024 •

edited by jieyouxu

Loading

jieyouxu left a comment •

edited

Loading