Skip to content

Commit

Permalink
ordering and wrapping cross-crate-info tests
Browse files Browse the repository at this point in the history
  • Loading branch information
EtomicBomb committed Jul 24, 2024
1 parent 2395a76 commit dc024fe
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 60 deletions.
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/command-list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"aux-codegen-backend",
"aux-crate",
"build-aux-docs",
"unique-doc-out-dir",
"build-fail",
"build-pass",
"check-fail",
Expand Down Expand Up @@ -226,6 +225,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"should-ice",
"stderr-per-bitwidth",
"test-mir-pass",
"unique-doc-out-dir",
"unset-exec-env",
"unset-rustc-env",
// Used by the tidy check `unknown_revision`.
Expand Down
13 changes: 7 additions & 6 deletions tests/rustdoc/cross-crate-info/cargo-transitive-no-index/s.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
//@ aux-build:t.rs
//@ build-aux-docs

//@ has q/struct.Quebec.html
//@ has s/struct.Sierra.html
//@ 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 trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ hasraw search-index.js 'Tango'
//@ has q/struct.Quebec.html
//@ has s/struct.Sierra.html
//@ 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;
pub struct Sierra;
Expand Down
21 changes: 11 additions & 10 deletions tests/rustdoc/cross-crate-info/cargo-transitive/s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
//@ doc-flags:--enable-index-page
//@ 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
//@ 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'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Tango'
//@ has index.html
//@ has index.html '//ul[@class="all-items"]//a[@href="t/index.html"]' 't'
//@ has q/struct.Quebec.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;
pub struct Sierra;
Expand Down
11 changes: 6 additions & 5 deletions tests/rustdoc/cross-crate-info/cargo-two-no-index/e.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
//@ aux-build:f.rs
//@ 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 f/trait.Foxtrot.html
//@ 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;
pub enum Echo {}
Expand Down
17 changes: 9 additions & 8 deletions tests/rustdoc/cross-crate-info/cargo-two/e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
//@ doc-flags:--enable-index-page
//@ 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
//@ 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 index.html
//@ has f/trait.Foxtrot.html
//@ 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;
pub enum Echo {}
Expand Down
14 changes: 7 additions & 7 deletions tests/rustdoc/cross-crate-info/index-on-last/e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
//@ doc-flags:--enable-index-page
//@ 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
//@ 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 index.html
//@ has f/trait.Foxtrot.html
//@ 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

Expand Down
26 changes: 13 additions & 13 deletions tests/rustdoc/cross-crate-info/kitchen-sink/i.rs
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
//@ aux-build:q.rs
//@ aux-build:r.rs
//@ aux-build:t.rs
//@ aux-build:s.rs
//@ aux-build:t.rs
//@ build-aux-docs
//@ doc-flags:--enable-index-page
//@ doc-flags:-Zunstable-options

//@ hasraw search-index.js 'Quebec'
//@ hasraw search-index.js 'Sierra'
//@ has index.html '//h1' 'List of all crates'
//@ 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="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 search-index.js 'Romeo'
//@ hasraw s/struct.Sierra.html 'Tango'
//@ hasraw trait.impl/t/trait.Tango.js 'struct.Sierra.html'
//@ has index.html '//h1' 'List of all crates'
//@ hasraw search-index.js 'Quebec'
//@ hasraw search-index.js 'Romeo'
//@ hasraw search-index.js 'Sierra'
//@ hasraw search-index.js 'Tango'
//@ has index.html '//ul[@class="all-items"]//a[@href="r/index.html"]' 'r'
//@ 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

Expand Down
6 changes: 3 additions & 3 deletions tests/rustdoc/cross-crate-info/single-crate-baseline/q.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
//@ doc-flags:--enable-index-page
//@ 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 '//h1' 'List of all crates'
//@ has index.html '//ul[@class="all-items"]//a[@href="q/index.html"]' 'q'
//@ has q/struct.Quebec.html
//@ hasraw search-index.js 'Quebec'

// there's nothing cross-crate going on here

Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc/cross-crate-info/single-crate-no-index/q.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ build-aux-docs

//@ hasraw search-index.js 'Quebec'
//@ has q/struct.Quebec.html
//@ hasraw search-index.js 'Quebec'

// there's nothing cross-crate going on here

Expand Down
3 changes: 2 additions & 1 deletion tests/rustdoc/cross-crate-info/working-dir-examples/q.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

//@ 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;
11 changes: 6 additions & 5 deletions tests/rustdoc/cross-crate-info/write-docs-somewhere-else/e.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
//@ aux-build:f.rs
//@ 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 f/trait.Foxtrot.html
//@ 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;
pub enum Echo {}
Expand Down

0 comments on commit dc024fe

Please sign in to comment.