Rename rustdoc js test suites

23 files changed, 17 insertions, 17 deletions

diff --git a/src/test/rustdoc-js-not-std/basic.js b/src/test/rustdoc-js-not-std/basic.js
deleted file mode 100644
index d99b23468b6..00000000000
--- a/src/test/rustdoc-js-not-std/basic.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const QUERY = 'Fo';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'basic', 'name': 'Foo' },
-    ],
-};
diff --git a/src/test/rustdoc-js/alias-1.js b/src/test/rustdoc-js-std/alias-1.js
index 7c6327fcdd7..7c6327fcdd7 100644
--- a/src/test/rustdoc-js/alias-1.js
+++ b/src/test/rustdoc-js-std/alias-1.js
diff --git a/src/test/rustdoc-js/alias-2.js b/src/test/rustdoc-js-std/alias-2.js
index f3c6713692b..f3c6713692b 100644
--- a/src/test/rustdoc-js/alias-2.js
+++ b/src/test/rustdoc-js-std/alias-2.js
diff --git a/src/test/rustdoc-js/alias-3.js b/src/test/rustdoc-js-std/alias-3.js
index 392b1e81837..392b1e81837 100644
--- a/src/test/rustdoc-js/alias-3.js
+++ b/src/test/rustdoc-js-std/alias-3.js
diff --git a/src/test/rustdoc-js/alias.js b/src/test/rustdoc-js-std/alias.js
index 2b709c99119..2b709c99119 100644
--- a/src/test/rustdoc-js/alias.js
+++ b/src/test/rustdoc-js-std/alias.js
diff --git a/src/test/rustdoc-js-std/basic.js b/src/test/rustdoc-js-std/basic.js
new file mode 100644
index 00000000000..824cac71083
--- /dev/null
+++ b/src/test/rustdoc-js-std/basic.js
@@ -0,0 +1,15 @@
+const QUERY = 'String';
+
+const EXPECTED = {
+    'others': [
+        { 'path': 'std::string', 'name': 'String' },
+        { 'path': 'std::ffi', 'name': 'CString' },
+        { 'path': 'std::ffi', 'name': 'OsString' },
+    ],
+    'in_args': [
+        { 'path': 'std::str', 'name': 'eq' },
+    ],
+    'returned': [
+        { 'path': 'std::string::String', 'name': 'add' },
+    ],
+};
diff --git a/src/test/rustdoc-js/deduplication.js b/src/test/rustdoc-js-std/deduplication.js
index f02f6cf55ed..f02f6cf55ed 100644
--- a/src/test/rustdoc-js/deduplication.js
+++ b/src/test/rustdoc-js-std/deduplication.js
diff --git a/src/test/rustdoc-js/enum-option.js b/src/test/rustdoc-js-std/enum-option.js
index 902e0906910..902e0906910 100644
--- a/src/test/rustdoc-js/enum-option.js
+++ b/src/test/rustdoc-js-std/enum-option.js
diff --git a/src/test/rustdoc-js/filter-crate.js b/src/test/rustdoc-js-std/filter-crate.js
index 2e0330c4497..2e0330c4497 100644
--- a/src/test/rustdoc-js/filter-crate.js
+++ b/src/test/rustdoc-js-std/filter-crate.js
diff --git a/src/test/rustdoc-js/fn-forget.js b/src/test/rustdoc-js-std/fn-forget.js
index 66a5fcaa781..66a5fcaa781 100644
--- a/src/test/rustdoc-js/fn-forget.js
+++ b/src/test/rustdoc-js-std/fn-forget.js
diff --git a/src/test/rustdoc-js/from_u.js b/src/test/rustdoc-js-std/from_u.js
index e3f3cd436aa..e3f3cd436aa 100644
--- a/src/test/rustdoc-js/from_u.js
+++ b/src/test/rustdoc-js-std/from_u.js
diff --git a/src/test/rustdoc-js/keyword.js b/src/test/rustdoc-js-std/keyword.js
index 868ddd7b6dc..868ddd7b6dc 100644
--- a/src/test/rustdoc-js/keyword.js
+++ b/src/test/rustdoc-js-std/keyword.js
diff --git a/src/test/rustdoc-js/macro-check.js b/src/test/rustdoc-js-std/macro-check.js
index 242e0cbf5f4..242e0cbf5f4 100644
--- a/src/test/rustdoc-js/macro-check.js
+++ b/src/test/rustdoc-js-std/macro-check.js
diff --git a/src/test/rustdoc-js/macro-print.js b/src/test/rustdoc-js-std/macro-print.js
index 858046e72e9..858046e72e9 100644
--- a/src/test/rustdoc-js/macro-print.js
+++ b/src/test/rustdoc-js-std/macro-print.js
diff --git a/src/test/rustdoc-js/multi-query.js b/src/test/rustdoc-js-std/multi-query.js
index 01e54065189..01e54065189 100644
--- a/src/test/rustdoc-js/multi-query.js
+++ b/src/test/rustdoc-js-std/multi-query.js
diff --git a/src/test/rustdoc-js/never.js b/src/test/rustdoc-js-std/never.js
index 392b1e81837..392b1e81837 100644
--- a/src/test/rustdoc-js/never.js
+++ b/src/test/rustdoc-js-std/never.js
diff --git a/src/test/rustdoc-js/quoted.js b/src/test/rustdoc-js-std/quoted.js
index 924129f86c8..924129f86c8 100644
--- a/src/test/rustdoc-js/quoted.js
+++ b/src/test/rustdoc-js-std/quoted.js
diff --git a/src/test/rustdoc-js/should-fail.js b/src/test/rustdoc-js-std/should-fail.js
index b85a47dc08a..b85a47dc08a 100644
--- a/src/test/rustdoc-js/should-fail.js
+++ b/src/test/rustdoc-js-std/should-fail.js
diff --git a/src/test/rustdoc-js/string-from_ut.js b/src/test/rustdoc-js-std/string-from_ut.js
index f9edf4408db..f9edf4408db 100644
--- a/src/test/rustdoc-js/string-from_ut.js
+++ b/src/test/rustdoc-js-std/string-from_ut.js
diff --git a/src/test/rustdoc-js/struct-vec.js b/src/test/rustdoc-js-std/struct-vec.js
index 2c808143bae..2c808143bae 100644
--- a/src/test/rustdoc-js/struct-vec.js
+++ b/src/test/rustdoc-js-std/struct-vec.js
diff --git a/src/test/rustdoc-js/vec-new.js b/src/test/rustdoc-js-std/vec-new.js
index e4daa5065d2..e4daa5065d2 100644
--- a/src/test/rustdoc-js/vec-new.js
+++ b/src/test/rustdoc-js-std/vec-new.js
diff --git a/src/test/rustdoc-js/basic.js b/src/test/rustdoc-js/basic.js
index 824cac71083..d99b23468b6 100644
--- a/src/test/rustdoc-js/basic.js
+++ b/src/test/rustdoc-js/basic.js
@@ -1,15 +1,7 @@
-const QUERY = 'String';
+const QUERY = 'Fo';
 
 const EXPECTED = {
     'others': [
-        { 'path': 'std::string', 'name': 'String' },
-        { 'path': 'std::ffi', 'name': 'CString' },
-        { 'path': 'std::ffi', 'name': 'OsString' },
-    ],
-    'in_args': [
-        { 'path': 'std::str', 'name': 'eq' },
-    ],
-    'returned': [
-        { 'path': 'std::string::String', 'name': 'add' },
+        { 'path': 'basic', 'name': 'Foo' },
     ],
 };
diff --git a/src/test/rustdoc-js-not-std/basic.rs b/src/test/rustdoc-js/basic.rs
index 4a835673a59..4a835673a59 100644
--- a/src/test/rustdoc-js-not-std/basic.rs
+++ b/src/test/rustdoc-js/basic.rs