[WIP] test-cargo-miri changes

Author: bjorn3

test-cargo-miri/Cargo.lock

@@ -10,7 +10,7 @@ edition = "2024"
 
 [dependencies]
 byteorder = "1.0"
-cdylib = { path = "cdylib" }
+#cdylib = { path = "cdylib" }
 exported_symbol = { path = "exported-symbol" }
 proc_macro_crate = { path = "proc-macro-crate" }
 issue_1567 = { path = "issue-1567" }

test-cargo-miri/Cargo.toml

@@ -40,6 +40,11 @@ def normalize_stdout(str):
     str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
     return str
 
+def normalize_stderr(str):
+    # the order of reported crate types is non-deterministic and the target differs between platforms
+    str = re.sub("warning: dropping unsupported crate type.*", "UNSUPPORTED CRATE TYPE", str)
+    return str
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
@@ -71,7 +76,7 @@ def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
     )
     (stdout, stderr) = p.communicate(input=stdin)
     stdout = normalize_stdout(stdout.decode("UTF-8"))
-    stderr = stderr.decode("UTF-8")
+    stderr = normalize_stderr(stderr.decode("UTF-8"))
 
     stdout_matches = check_output(stdout, stdout_ref, "stdout")
     stderr_matches = check_output(stderr, stderr_ref, "stderr")

test-cargo-miri/run-test.py

@@ -1,3 +1,7 @@
+UNSUPPORTED CRATE TYPE
+
+UNSUPPORTED CRATE TYPE
+
 main
 hello world
 "hello world"

test-cargo-miri/run.args.stderr.ref

@@ -1,2 +1,6 @@
+UNSUPPORTED CRATE TYPE
+
+UNSUPPORTED CRATE TYPE
+
 main
 --target-dir=target/custom-run

test-cargo-miri/run.custom-target-dir.stderr.ref

@@ -1 +1,5 @@
+UNSUPPORTED CRATE TYPE
+
+UNSUPPORTED CRATE TYPE
+
 main

test-cargo-miri/run.default.stderr.ref

@@ -1 +1 @@
-subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,cdylib,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate
+subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate

test-cargo-miri/run.local_crate.stdout.ref

@@ -0,0 +1,4 @@
+UNSUPPORTED CRATE TYPE
+
+UNSUPPORTED CRATE TYPE
+