From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 14 Mar 2018 21:37:00 +0000 (+0300)
Subject: Don't check for filenames in message-format tests
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~43^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f9306094047fa1f0f26cd261f08b3336deaa5314;p=cargo.git

Don't check for filenames in message-format tests

Depending on the OS, there might be an additional artifacts for
debuginfo (dSYM folder for macs, .pbd file for windows). Given that we
can't disable `.pdb` for windows[1], let's just ignore all filenames!

[1]: https://github.com/rust-lang/rust/pull/28505)
---

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index e21597f84..3df97b401 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -3106,9 +3106,6 @@ fn compiler_json_error_format() {
             version = "0.5.0"
             authors = ["wycats@example.com"]
 
-            [profile.dev]
-            debug = false   # prevent the *.dSYM from affecting the test result
-
             [dependencies.bar]
             path = "bar"
         "#)
@@ -3142,7 +3139,7 @@ fn compiler_json_error_format() {
         "reason":"compiler-artifact",
         "profile": {
             "debug_assertions": true,
-            "debuginfo": null,
+            "debuginfo": 2,
             "opt_level": "0",
             "overflow_checks": true,
             "test": false
@@ -3182,13 +3179,13 @@ fn compiler_json_error_format() {
         },
         "profile": {
             "debug_assertions": true,
-            "debuginfo": null,
+            "debuginfo": 2,
             "opt_level": "0",
             "overflow_checks": true,
             "test": false
         },
         "features": [],
-        "filenames": ["[..]"],
+        "filenames": "{...}",
         "fresh": false
     }
 "#));
@@ -3202,7 +3199,7 @@ fn compiler_json_error_format() {
         "reason":"compiler-artifact",
         "profile": {
             "debug_assertions": true,
-            "debuginfo": null,
+            "debuginfo": 2,
             "opt_level": "0",
             "overflow_checks": true,
             "test": false
@@ -3230,13 +3227,13 @@ fn compiler_json_error_format() {
         },
         "profile": {
             "debug_assertions": true,
-            "debuginfo": null,
+            "debuginfo": 2,
             "opt_level": "0",
             "overflow_checks": true,
             "test": false
         },
         "features": [],
-        "filenames": ["[..]"],
+        "filenames": "{...}",
         "fresh": true
     }
 "#));
@@ -3297,7 +3294,7 @@ fn message_format_json_forward_stderr() {
             "test":false
         },
         "features":[],
-        "filenames":["[..]"],
+        "filenames": "{...}",
         "fresh": false
     }
 "#));