diff --git a/src/test/rustdoc-js/keyword.js b/src/test/rustdoc-js/keyword.js new file mode 100644 index 00000000000..65de3a4662f --- /dev/null +++ b/src/test/rustdoc-js/keyword.js @@ -0,0 +1,20 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ignore-order + +const QUERY = 'fn'; + +const EXPECTED = { + 'others': [ + { 'path': 'std', 'name': 'fn', ty: 15 }, // 15 is for primitive types + { 'path': 'std', 'name': 'fn', ty: 21 }, // 21 is for keywords + ], +}; diff --git a/src/test/rustdoc-js/should-fail.js b/src/test/rustdoc-js/should-fail.js new file mode 100644 index 00000000000..5e41422612a --- /dev/null +++ b/src/test/rustdoc-js/should-fail.js @@ -0,0 +1,19 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// should-fail + +const QUERY = 'fn'; + +const EXPECTED = { + 'others': [ + { 'path': 'std', 'name': 'fn', ty: 14 }, + ], +}; diff --git a/src/tools/rustdoc-js/tester.js b/src/tools/rustdoc-js/tester.js index a05c8a8ac91..3c1fceaf8fa 100644 --- a/src/tools/rustdoc-js/tester.js +++ b/src/tools/rustdoc-js/tester.js @@ -164,6 +164,7 @@ function loadContent(content) { m._compile(content, "tmp.js"); m.exports.ignore_order = content.indexOf("\n// ignore-order\n") !== -1; m.exports.exact_check = content.indexOf("\n// exact-check\n") !== -1; + m.exports.should_fail = content.indexOf("\n// should-fail\n") !== -1; return m.exports; } @@ -259,6 +260,7 @@ function main(argv) { const query = loadedFile.QUERY; const ignore_order = loadedFile.ignore_order; const exact_check = loadedFile.exact_check; + const should_fail = loadedFile.should_fail; var results = loaded.execSearch(loaded.getQuery(query), index); process.stdout.write('Checking "' + file + '" ... '); var error_text = []; @@ -289,7 +291,11 @@ function main(argv) { } } } - if (error_text.length !== 0) { + if (error_text.length === 0 && should_fail === true) { + errors += 1; + console.error("FAILED"); + console.error("==> Test was supposed to fail but all items were found..."); + } else if (error_text.length !== 0 && should_fail === false) { errors += 1; console.error("FAILED"); console.error(error_text.join("\n"));