Skip to content

Commit edfb74e

Browse files
committed
Fix tests
1 parent 8b97052 commit edfb74e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/test/run-make/emit-shared-files/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ invocation-only:
2323

2424
toolchain-only:
2525
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources --output $(TOOLCHAIN_ONLY) --resource-suffix=-xxx --extend-css z.css x.rs
26-
[ -e $(TOOLCHAIN_ONLY)/storage-xxx.js ]
27-
! [ -e $(TOOLCHAIN_ONLY)/SourceSerif4-It.ttf.woff2 ]
26+
[ -e $(TOOLCHAIN_ONLY)/static.files/storage-*.js ]
27+
[ -e $(TOOLCHAIN_ONLY)/static.files/SourceSerif4-It-*.ttf.woff2 ]
2828
! [ -e $(TOOLCHAIN_ONLY)/search-index-xxx.js ]
2929
! [ -e $(TOOLCHAIN_ONLY)/x/index.html ]
3030
! [ -e $(TOOLCHAIN_ONLY)/theme.css ]
3131

32-
[ -e $(TOOLCHAIN_ONLY)/main-xxx.js ]
32+
[ -e $(TOOLCHAIN_ONLY)/static.files/main-*.js ]
3333
! [ -e $(TOOLCHAIN_ONLY)/y-xxx.css ]
3434

3535
all-shared:
3636
$(RUSTDOC) -Z unstable-options --emit=toolchain-shared-resources,unversioned-shared-resources --output $(ALL_SHARED) --resource-suffix=-xxx --extend-css z.css x.rs
37-
[ -e $(ALL_SHARED)/storage-xxx.js ]
38-
[ -e $(ALL_SHARED)/SourceSerif4-It.ttf.woff2 ]
37+
[ -e $(ALL_SHARED)/static.files/storage-*.js ]
38+
[ -e $(ALL_SHARED)/static.files/SourceSerif4-It-*.ttf.woff2 ]
3939
! [ -e $(ALL_SHARED)/search-index-xxx.js ]
4040
! [ -e $(ALL_SHARED)/settings.html ]
4141
! [ -e $(ALL_SHARED)/x ]
4242
! [ -e $(ALL_SHARED)/src ]
4343
! [ -e $(ALL_SHARED)/theme.css ]
4444

45-
[ -e $(ALL_SHARED)/main-xxx.js ]
45+
[ -e $(ALL_SHARED)/static.files/main-*.js ]
4646
! [ -e $(ALL_SHARED)/y-xxx.css ]

src/test/run-make/issue-88756-default-output/output-default.stdout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ Options:
115115
Provide width of the output for truncated error
116116
messages
117117
--json CONFIG Configure the structure of JSON diagnostics
118-
--disable-minification
119-
Disable minification applied on JS files
120118
-A, --allow LINT Set lint allowed
121119
-W, --warn LINT Set lint warnings
122120
--force-warn LINT
@@ -173,6 +171,8 @@ Options:
173171
--scrape-tests Include test code when scraping examples
174172
--with-examples path to function call information (for displaying examples in the documentation)
175173

174+
--disable-minification
175+
removed
176176
--plugin-path DIR
177177
removed, see issue #44136
178178
<https://github.com/rust-lang/rust/issues/44136> for

0 commit comments

Comments
 (0)