mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ordering and wrapping cross-crate-info tests

Browse Source
This commit is contained in:
EtomicBomb 2024-07-24 22:16:01 +00:00
parent 794434ec63
commit d8211def61
11 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/compiletest/src/command-list.rs
View File

@ -9,7 +9,6 @@
"aux-codegen-backend", "aux-codegen-backend",
"aux-crate", "aux-crate",
"build-aux-docs", "build-aux-docs",
"unique-doc-out-dir",
"build-fail", "build-fail",
"build-pass", "build-pass",
"check-fail", "check-fail",
@ -227,6 +226,7 @@
"should-ice", "should-ice",
"stderr-per-bitwidth", "stderr-per-bitwidth",
"test-mir-pass", "test-mir-pass",
"unique-doc-out-dir",
"unset-exec-env", "unset-exec-env",
"unset-rustc-env", "unset-rustc-env",
// Used by the tidy check `unknown_revision`. // Used by the tidy check `unknown_revision`.

15
tests/rustdoc/cross-crate-info/cargo-transitive-no-index/s.rs
View File

@ -1,16 +1,17 @@
//@ aux-build:t.rs //@ aux-build:t.rs
//@ build-aux-docs //@ build-aux-docs
//@ has t/trait.Tango.html
//@ hasraw search-index.js 'Quebec'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Tango'
//@ has q/struct.Quebec.html //@ has q/struct.Quebec.html
//@ has s/struct.Sierra.html //@ has s/struct.Sierra.html
//@ has t/trait.Tango.html
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ hasraw search-index.js 'Tango'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Quebec'
// We document multiple crates into the same output directory, which merges the cross-crate information. Everything is available. // We document multiple crates into the same output directory, which
// merges the cross-crate information. Everything is available.
extern crate t; extern crate t;
pub struct Sierra; pub struct Sierra;

23
tests/rustdoc/cross-crate-info/cargo-transitive/s.rs
View File

@ -3,21 +3,22 @@
//@ doc-flags:--enable-index-page //@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options //@ doc-flags:-Zunstable-options
//@ has t/trait.Tango.html
//@ hasraw search-index.js 'Quebec'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ has index.html '//ul[@class="all-items"]//a[@href="t/index.html"]' 't'
//@ has index.html '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="s/index.html"]' 's'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Tango'
//@ has index.html //@ has index.html
//@ has index.html '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has index.html '//ul[@class="all-items"]//a[@href="s/index.html"]' 's'
//@ has index.html '//ul[@class="all-items"]//a[@href="t/index.html"]' 't'
//@ has q/struct.Quebec.html //@ has q/struct.Quebec.html
//@ has s/struct.Sierra.html //@ has s/struct.Sierra.html
//@ has t/trait.Tango.html
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ hasraw search-index.js 'Tango'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Quebec'
// We document multiple crates into the same output directory, which merges the cross-crate information. Everything is available. // We document multiple crates into the same output directory, which
// merges the cross-crate information. Everything is available.
extern crate t; extern crate t;
pub struct Sierra; pub struct Sierra;

11
tests/rustdoc/cross-crate-info/cargo-two-no-index/e.rs
View File

@ -1,14 +1,15 @@
//@ aux-build:f.rs //@ aux-build:f.rs
//@ build-aux-docs //@ build-aux-docs
//@ hasraw search-index.js 'Echo'
//@ hasraw search-index.js 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ has f/trait.Foxtrot.html
//@ has e/enum.Echo.html //@ has e/enum.Echo.html
//@ has f/trait.Foxtrot.html
//@ hasraw e/enum.Echo.html 'Foxtrot' //@ hasraw e/enum.Echo.html 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ hasraw search-index.js 'Foxtrot'
//@ hasraw search-index.js 'Echo'
// document two crates in the same way that cargo does. do not provide --enable-index-page // document two crates in the same way that cargo does. do not provide
// --enable-index-page
extern crate f; extern crate f;
pub enum Echo {} pub enum Echo {}

19
tests/rustdoc/cross-crate-info/cargo-two/e.rs
View File

@ -3,18 +3,19 @@
//@ doc-flags:--enable-index-page //@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options //@ doc-flags:-Zunstable-options
//@ hasraw search-index.js 'Echo'
//@ hasraw search-index.js 'Foxtrot'
//@ has index.html '//ul[@class="all-items"]//a[@href="e/index.html"]' 'e'
//@ has index.html '//ul[@class="all-items"]//a[@href="f/index.html"]' 'f'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ has f/trait.Foxtrot.html
//@ has index.html '//h1' 'List of all crates'
//@ has e/enum.Echo.html
//@ has index.html //@ has index.html
//@ has index.html '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="f/index.html"]' 'f'
//@ has index.html '//ul[@class="all-items"]//a[@href="e/index.html"]' 'e'
//@ has e/enum.Echo.html
//@ has f/trait.Foxtrot.html
//@ hasraw e/enum.Echo.html 'Foxtrot' //@ hasraw e/enum.Echo.html 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ hasraw search-index.js 'Foxtrot'
//@ hasraw search-index.js 'Echo'
// document two crates in the same way that cargo does, writing them both into the same output directory // document two crates in the same way that cargo does, writing them both
// into the same output directory
extern crate f; extern crate f;
pub enum Echo {} pub enum Echo {}

16
tests/rustdoc/cross-crate-info/index-on-last/e.rs
View File

@ -3,16 +3,16 @@
//@ doc-flags:--enable-index-page //@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options //@ doc-flags:-Zunstable-options
//@ hasraw search-index.js 'Echo'
//@ hasraw search-index.js 'Foxtrot'
//@ has index.html '//ul[@class="all-items"]//a[@href="e/index.html"]' 'e'
//@ has index.html '//ul[@class="all-items"]//a[@href="f/index.html"]' 'f'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ has f/trait.Foxtrot.html
//@ has index.html '//h1' 'List of all crates'
//@ has e/enum.Echo.html
//@ has index.html //@ has index.html
//@ has index.html '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="f/index.html"]' 'f'
//@ has index.html '//ul[@class="all-items"]//a[@href="e/index.html"]' 'e'
//@ has e/enum.Echo.html
//@ has f/trait.Foxtrot.html
//@ hasraw e/enum.Echo.html 'Foxtrot' //@ hasraw e/enum.Echo.html 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ hasraw search-index.js 'Foxtrot'
//@ hasraw search-index.js 'Echo'
// only declare --enable-index-page to the last rustdoc invocation // only declare --enable-index-page to the last rustdoc invocation

38
tests/rustdoc/cross-crate-info/kitchen-sink/i.rs
View File

@ -1,31 +1,31 @@
//@ aux-build:q.rs //@ aux-build:q.rs
//@ aux-build:r.rs //@ aux-build:r.rs
//@ aux-build:t.rs
//@ aux-build:s.rs //@ aux-build:s.rs
//@ aux-build:t.rs
//@ build-aux-docs //@ build-aux-docs
//@ doc-flags:--enable-index-page //@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options //@ doc-flags:-Zunstable-options
//@ hasraw search-index.js 'Quebec'
//@ hasraw search-index.js 'Sierra'
//@ has index.html
//@ has s/struct.Sierra.html
//@ hasraw s/struct.Sierra.html 'Tango'
//@ has index.html '//ul[@class="all-items"]//a[@href="i/index.html"]' 'i'
//@ has q/struct.Quebec.html
//@ has type.impl/s/struct.Sierra.js
//@ hasraw type.impl/s/struct.Sierra.js 'Romeo'
//@ hasraw type.impl/s/struct.Sierra.js 'Tango'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has index.html '//ul[@class="all-items"]//a[@href="t/index.html"]' 't'
//@ has index.html '//ul[@class="all-items"]//a[@href="s/index.html"]' 's'
//@ has r/type.Romeo.html
//@ has t/trait.Tango.html
//@ hasraw search-index.js 'Romeo'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ has index.html '//h1' 'List of all crates' //@ has index.html '//h1' 'List of all crates'
//@ hasraw search-index.js 'Tango' //@ has index.html
//@ has index.html '//ul[@class="all-items"]//a[@href="i/index.html"]' 'i'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has index.html '//ul[@class="all-items"]//a[@href="r/index.html"]' 'r' //@ has index.html '//ul[@class="all-items"]//a[@href="r/index.html"]' 'r'
//@ has index.html '//ul[@class="all-items"]//a[@href="s/index.html"]' 's'
//@ has index.html '//ul[@class="all-items"]//a[@href="t/index.html"]' 't'
//@ has q/struct.Quebec.html
//@ has r/type.Romeo.html
//@ has s/struct.Sierra.html
//@ has t/trait.Tango.html
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ hasraw search-index.js 'Quebec'
//@ hasraw search-index.js 'Romeo'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Tango'
//@ has type.impl/s/struct.Sierra.js
//@ hasraw type.impl/s/struct.Sierra.js 'Tango'
//@ hasraw type.impl/s/struct.Sierra.js 'Romeo'
// document everything in the default mode // document everything in the default mode

6
tests/rustdoc/cross-crate-info/single-crate-baseline/q.rs
View File

@ -2,11 +2,11 @@
//@ doc-flags:--enable-index-page //@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options //@ doc-flags:-Zunstable-options
//@ hasraw search-index.js 'Quebec'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has index.html '//h1' 'List of all crates'
//@ has index.html //@ has index.html
//@ has index.html '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has q/struct.Quebec.html //@ has q/struct.Quebec.html
//@ hasraw search-index.js 'Quebec'
// there's nothing cross-crate going on here // there's nothing cross-crate going on here

2
tests/rustdoc/cross-crate-info/single-crate-no-index/q.rs
View File

@ -1,7 +1,7 @@
//@ build-aux-docs //@ build-aux-docs
//@ hasraw search-index.js 'Quebec'
//@ has q/struct.Quebec.html //@ has q/struct.Quebec.html
//@ hasraw search-index.js 'Quebec'
// there's nothing cross-crate going on here // there's nothing cross-crate going on here

3
tests/rustdoc/cross-crate-info/working-dir-examples/q.rs
View File

@ -5,6 +5,7 @@
//@ has examples //@ has examples
// where will --scrape-examples-output-path resolve the path to be? should be the root output directory // where will --scrape-examples-output-path resolve the path to be?
// should be the root output directory
pub struct Quebec; pub struct Quebec;

11
tests/rustdoc/cross-crate-info/write-docs-somewhere-else/e.rs
View File

@ -1,14 +1,15 @@
//@ aux-build:f.rs //@ aux-build:f.rs
//@ build-aux-docs //@ build-aux-docs
//@ hasraw search-index.js 'Echo'
//@ !hasraw search-index.js 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ !has f/trait.Foxtrot.html
//@ has e/enum.Echo.html //@ has e/enum.Echo.html
//@ !has f/trait.Foxtrot.html
//@ hasraw e/enum.Echo.html 'Foxtrot' //@ hasraw e/enum.Echo.html 'Foxtrot'
//@ hasraw trait.impl/f/trait.Foxtrot.js 'enum.Echo.html'
//@ !hasraw search-index.js 'Foxtrot'
//@ hasraw search-index.js 'Echo'
// test the fact that our test runner will document this crate somewhere else // test the fact that our test runner will document this crate somewhere
// else
extern crate f; extern crate f;
pub enum Echo {} pub enum Echo {}