about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2022-11-09 21:53:37 -0800
committerGitHub <noreply@github.com>2022-11-09 21:53:37 -0800
commit985fa02783ffb91a3b266e1c818aa927ff40c7bb (patch)
tree07babedfe27c8583ff76e5559a15de2c5a385e15 /src/tools
parent41c8a62b108e05c37a6ae9bca2bb0a46bc9a83e8 (diff)
parent9f0e3761e858d17f17242963ae71eaead6f58882 (diff)
downloadrust-985fa02783ffb91a3b266e1c818aa927ff40c7bb.tar.gz
rust-985fa02783ffb91a3b266e1c818aa927ff40c7bb.zip
Rollup merge of #104201 - GuillaumeGomez:gui-test-check-file-errors, r=notriddle
Add check in GUI test for file loading failure

Since https://github.com/rust-lang/rust/pull/101702, some resources location need to be updated in case their content changed because then their hash will change too. This will prevent errors like https://github.com/rust-lang/rust/pull/104114 to happen again.

The second commit is to prevent CORS errors: when a file is linked from a file itself imported, the web browser considers they come from a different domain and therefore triggers the error. The option tells the web browser to ignore this case.

cc ```@jsha```
r? ```@notriddle```
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rustdoc-gui/tester.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/rustdoc-gui/tester.js b/src/tools/rustdoc-gui/tester.js
index 70d5f94472f..d40d9a3cb54 100644
--- a/src/tools/rustdoc-gui/tester.js
+++ b/src/tools/rustdoc-gui/tester.js
@@ -149,6 +149,7 @@ async function main(argv) {
         // This is more convenient that setting fields one by one.
         let args = [
             "--variable", "DOC_PATH", opts["doc_folder"], "--enable-fail-on-js-error",
+            "--allow-file-access-from-files",
         ];
         if (opts["debug"]) {
             debug = true;