Migrate output-type-permutations run-make test to rmake

[Oneirical]

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

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

[rustbot]

r? @jieyouxu

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]

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

[Kobzol]

Well, what a fun test this is. I think that the "middle section" (at least lines 48 - 78, but maybe even until line 123) could be made more readable by introducing some helper, that would receive rustc in a closure, set flags for it, fill in the emit combinations, and remove the created files between each invocation. But maybe the test structure is too irregular for that, it would need to be tried :)

[jieyouxu]

@rustbot author

[bors]

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

[rustbot]

The run-make-support library was changed

cc @jieyouxu

[Oneirical]

@rustbot review

[jieyouxu]

Thanks, I do find the new structure easier to follow because each sub-test is cleanly grouped. I have some more suggestions which I think makes the test easier to read.

[jieyouxu]

Suggestion: so I thought maybe we could have a param struct for must_exist, can_exist and dir, something like

struct Expectations {
    /// Name of the directory where the test happens.
    test_dir: String,
    /// Output files which must be found. The test fails if any are absent.
    expected_files: Vec<String>,
    /// Allowed output files which will not trigger a failure.
    allowed_files: Vec<String>,
}

and callsite (each test call) can be like

assert_expected_output_files(
    Expectations {
        test_dir: "foo.bar".to_string(),
        expected_files: s!["a.lib", static_lib_name("bar")],
        allowed_files: s!["b.dylib"],
    },
    || { todo!() }
);

I find this helpful because it clearly documents which each parameter means local to each assert_expected_output_files call.

the s![] macro is just a little helper so we can have a mixed list of various kinds of strings (so as long as they impl ToString), it just converts them to a simple Vec<String>.

macro_rules! s {
    ( $( $x:expr ),* ) => {
        {
            let mut temp_vec = Vec::new();
            $(
                temp_vec.push($x.to_string());
            )*
            temp_vec
        }
    };
}

This avoids having to do the Box::leak(Box::new(...)) dance you have below.

[jieyouxu]

Note that I used a s![] declarative macro here and not try to do something like I: IntoIterator, I::Item: AsRef<str> because that can't handle heterogeneous element types (like having [&'a str, String] wouldn't work.

[Oneirical]

Implemented, see latest commit. Waiting for green CI to switch to review.

[jieyouxu]

@rustbot author

[jieyouxu]

Cool, let's run some try jobs, r=me if they come back green.

[jieyouxu]

@bors try

[bors]

⌛ Trying commit 8378da4 with merge 0e21599...

[bors]

⌛ Trying commit db010c6 with merge 87c83f3...

[bors]

☀️ Try build successful - checks-actions
Build commit: 87c83f3 (87c83f3ad1560ed8b67e213f4473f1817b8f5683)

[Oneirical]

I added the PathBuf on the line fs_wrapper::remove_file(PathBuf::from(&dir).join(&file)); and the Windows test passes. If you think the test is ready, do not r+ just yet as it will conflict with #126709.

@rustbot review

[jieyouxu]

Thanks, looks good, can you x fmt this test? (does x fmt currently work on rmake.rs, I forgor)

[jieyouxu]

Marking this as blocked

@rustbot blocked (waiting on #126709)

[bors]

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

[Oneirical]

@rustbot review

[jieyouxu]

@bors r=Kobzol,jieyouxu

[bors]

📌 Commit 811532b has been approved by Kobzol,jieyouxu

It is now in the queue for this repository.