From 2da2ade0f7b289cd2d670fa6c77f50b3559ede2b Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 22 Mar 2023 21:12:40 -0700 Subject: Rename tests to ensure they don't have overlapping names. Some tests will delete their output directory before starting. The output directory is based on the test names. If one test is the prefix of another test, then when that test starts, it could try to delete the output directory of the other test with the longer path. --- tests/rustdoc/primitive.rs | 21 --------------------- tests/rustdoc/primitive/primitive.rs | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 tests/rustdoc/primitive.rs create mode 100644 tests/rustdoc/primitive/primitive.rs (limited to 'tests/rustdoc') diff --git a/tests/rustdoc/primitive.rs b/tests/rustdoc/primitive.rs deleted file mode 100644 index 516c7c0c6fe..00000000000 --- a/tests/rustdoc/primitive.rs +++ /dev/null @@ -1,21 +0,0 @@ -#![crate_name = "foo"] - -#![feature(rustdoc_internals)] - -// @has foo/index.html '//h2[@id="primitives"]' 'Primitive Types' -// @has foo/index.html '//a[@href="primitive.i32.html"]' 'i32' -// @has foo/index.html '//div[@class="sidebar-elems"]//li/a' 'Primitive Types' -// @has foo/index.html '//div[@class="sidebar-elems"]//li/a/@href' '#primitives' -// @has foo/primitive.i32.html '//a[@class="primitive"]' 'i32' -// @has foo/primitive.i32.html '//h1' 'Primitive Type i32' -// @has foo/primitive.i32.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!' -// @has foo/index.html '//a/@href' '../foo/index.html' -// @!has foo/index.html '//span' '🔒' -#[doc(primitive = "i32")] -/// this is a test! -mod i32{} - -// @has foo/primitive.bool.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'hello' -#[doc(primitive = "bool")] -/// hello -mod bool {} diff --git a/tests/rustdoc/primitive/primitive.rs b/tests/rustdoc/primitive/primitive.rs new file mode 100644 index 00000000000..516c7c0c6fe --- /dev/null +++ b/tests/rustdoc/primitive/primitive.rs @@ -0,0 +1,21 @@ +#![crate_name = "foo"] + +#![feature(rustdoc_internals)] + +// @has foo/index.html '//h2[@id="primitives"]' 'Primitive Types' +// @has foo/index.html '//a[@href="primitive.i32.html"]' 'i32' +// @has foo/index.html '//div[@class="sidebar-elems"]//li/a' 'Primitive Types' +// @has foo/index.html '//div[@class="sidebar-elems"]//li/a/@href' '#primitives' +// @has foo/primitive.i32.html '//a[@class="primitive"]' 'i32' +// @has foo/primitive.i32.html '//h1' 'Primitive Type i32' +// @has foo/primitive.i32.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!' +// @has foo/index.html '//a/@href' '../foo/index.html' +// @!has foo/index.html '//span' '🔒' +#[doc(primitive = "i32")] +/// this is a test! +mod i32{} + +// @has foo/primitive.bool.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'hello' +#[doc(primitive = "bool")] +/// hello +mod bool {} -- cgit 1.4.1-3-g733a5