Skip to content

Commit 37ab3dc

Browse files
Make js tests work even with resource-suffix option
1 parent d6add90 commit 37ab3dc

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

src/tools/rustdoc-js-std/tester.js

+30-3
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,32 @@ function lookForEntry(entry, data) {
219219
return null;
220220
}
221221

222+
function findFile(dir, name, extension) {
223+
var entries = fs.readdirSync(dir);
224+
for (var i = 0; i < entries.length; ++i) {
225+
var entry = entries[i];
226+
var file_type = fs.statSync(dir + entry);
227+
if (file_type.isDirectory()) {
228+
continue;
229+
}
230+
if (entry.startsWith(name) && entry.endsWith(extension)) {
231+
return entry;
232+
}
233+
}
234+
return null;
235+
}
236+
237+
function readFileMatching(dir, name, extension) {
238+
if (dir.endsWith("/") === false) {
239+
dir += "/";
240+
}
241+
var f = findFile(dir, name, extension);
242+
if (f === null) {
243+
return "";
244+
}
245+
return readFile(dir + f);
246+
}
247+
222248
function main(argv) {
223249
if (argv.length !== 3) {
224250
console.error("Expected toolchain to check as argument (for example \
@@ -227,9 +253,10 @@ function main(argv) {
227253
}
228254
var toolchain = argv[2];
229255

230-
var mainJs = readFile("build/" + toolchain + "/doc/main.js");
231-
var ALIASES = readFile("build/" + toolchain + "/doc/aliases.js");
232-
var searchIndex = readFile("build/" + toolchain + "/doc/search-index.js").split("\n");
256+
var mainJs = readFileMatching("build/" + toolchain + "/doc/", "main", ".js");
257+
var ALIASES = readFileMatching("build/" + toolchain + "/doc/", "aliases", ".js");
258+
var searchIndex = readFileMatching("build/" + toolchain + "/doc/",
259+
"search-index", ".js").split("\n");
233260
if (searchIndex[searchIndex.length - 1].length === 0) {
234261
searchIndex.pop();
235262
}

0 commit comments

Comments
 (0)