Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake #127381

Oneirical · 2024-07-05T19:27:27Z

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

Please try on musl.

try-job: dist-x86_64-musl

rustbot · 2024-07-05T19:27:35Z

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-05T19:28:05Z

The run-make-support library was changed

cc @jieyouxu

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

jieyouxu · 2024-07-06T05:11:57Z

@bors delegate+ (for try jobs)

bors · 2024-07-06T05:12:01Z

✌️ @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

jieyouxu · 2024-07-06T05:12:07Z

@bors try

jieyouxu · 2024-07-06T05:49:10Z

@bors try please wake up

…try> Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `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 on musl. try-job: dist-x86_64-musl

bors · 2024-07-06T05:50:20Z

⌛ Trying commit 13115ce with merge 90002cd...

bors · 2024-07-06T06:59:45Z

☀️ Try build successful - checks-actions
Build commit: 90002cd (90002cddaba1d3610bfa936fd7568afde536568f)

jieyouxu

Thank you, the tests look good in general, I left some suggestions and some questions/discussions.

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

tests/run-make/env-dep-info/rmake.rs

tests/run-make/rustc-macro-dep-files/rmake.rs

jieyouxu · 2024-07-08T02:24:21Z

@rustbot author

bors · 2024-07-09T05:13:00Z

☔ The latest upstream changes (presumably #127378) made this pull request unmergeable. Please resolve the merge conflicts.

jieyouxu

Thank you, the tests look good, just minor doc adjustment requests ^^

jieyouxu · 2024-07-12T06:03:55Z

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

+/// Construct a plain `rustc` invocation with no flags set. Note that compiletest
+/// still presets the environment variables `HOST_RPATH_DIR` and `TARGET_RPATH_DIR`
+/// by default.


Suggestion: sorry I should've been more clear. What I meant was moreso set_common calls set_host_rpath, not the one in compiletest:

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

Lines 363 to 375 in 4a31a6c

/// Set the runtime library path as needed for running the host rustc/rustdoc/etc.

pub fn set_host_rpath(cmd: &mut Command) {

let ld_lib_path_envvar = env_var("LD_LIB_PATH_ENVVAR");

cmd.env(&ld_lib_path_envvar, {

let mut paths = vec![];

paths.push(cwd());

paths.push(PathBuf::from(env_var("HOST_RPATH_DIR")));

for p in env::split_paths(&env_var(&ld_lib_path_envvar)) {

paths.push(p.to_path_buf());

}

env::join_paths(paths.iter()).unwrap()

});

}

jieyouxu · 2024-07-12T06:10:18Z

r=me with a rebase + addressing the doc comment.
@rustbot author

Oneirical · 2024-07-12T14:59:25Z

@bors r=@jieyouxu

bors · 2024-07-12T14:59:27Z

📌 Commit fe76650 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#127381 - Oneirical:testalt-consciousness, r=jieyouxu Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `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 on musl. try-job: dist-x86_64-musl

rustbot assigned jieyouxu Jul 5, 2024

Oneirical force-pushed the testalt-consciousness branch from 21d9855 to 31cf03d Compare July 5, 2024 19:28

This comment has been minimized.

Sign in to view

Oneirical force-pushed the testalt-consciousness branch from 31cf03d to 13115ce Compare July 5, 2024 19:44

jieyouxu mentioned this pull request Jul 6, 2024

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

Open

jieyouxu approved these changes Jul 8, 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 8, 2024

Oneirical force-pushed the testalt-consciousness branch from 13115ce to 1d3c426 Compare July 8, 2024 15:46

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 testalt-consciousness branch from 1d3c426 to 215e89e Compare July 12, 2024 14:57

Oneirical added 3 commits July 12, 2024 10:57

rewrite and rename issue-83045 to rmake

f768db6

rewrite rustc-macro-dep-files to rmake

87c7a42

rewrite env-dep-info to rmake

fe76650

Oneirical force-pushed the testalt-consciousness branch from 215e89e to fe76650 Compare July 12, 2024 14:58

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 38c314e 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 testalt-consciousness branch July 14, 2024 12:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake #127381

Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake #127381

Oneirical commented Jul 5, 2024 •

edited

Loading

rustbot commented Jul 5, 2024

rustbot commented Jul 5, 2024

This comment has been minimized.

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

bors commented Jul 6, 2024

jieyouxu left a comment

jieyouxu commented Jul 8, 2024

bors commented Jul 9, 2024

jieyouxu left a comment

jieyouxu Jul 12, 2024

jieyouxu commented Jul 12, 2024

Oneirical commented Jul 12, 2024

bors commented Jul 12, 2024

	/// Set the runtime library path as needed for running the host rustc/rustdoc/etc.
	pub fn set_host_rpath(cmd: &mut Command) {
	let ld_lib_path_envvar = env_var("LD_LIB_PATH_ENVVAR");
	cmd.env(&ld_lib_path_envvar, {
	let mut paths = vec![];
	paths.push(cwd());
	paths.push(PathBuf::from(env_var("HOST_RPATH_DIR")));
	for p in env::split_paths(&env_var(&ld_lib_path_envvar)) {
	paths.push(p.to_path_buf());
	}
	env::join_paths(paths.iter()).unwrap()
	});
	}

Migrate issue-83045, rustc-macro-dep-files and env-dep-info run-make tests to rmake #127381

Migrate issue-83045, rustc-macro-dep-files and env-dep-info run-make tests to rmake #127381

Conversation

Oneirical commented Jul 5, 2024 • edited Loading

rustbot commented Jul 5, 2024

rustbot commented Jul 5, 2024

This comment has been minimized.

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

jieyouxu commented Jul 6, 2024

bors commented Jul 6, 2024

bors commented Jul 6, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu commented Jul 8, 2024

bors commented Jul 9, 2024

jieyouxu left a comment

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 `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake #127381

Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake #127381

Oneirical commented Jul 5, 2024 •

edited

Loading