Skip to content

Commit 52ede63

Browse files
committed
Remove the parse-fail test suite
1 parent 73e1f89 commit 52ede63

File tree

7 files changed

+6
-17
lines changed

7 files changed

+6
-17
lines changed

src/bootstrap/builder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ impl<'a> Builder<'a> {
379379
test::Ui,
380380
test::RunPass,
381381
test::CompileFail,
382-
test::ParseFail,
383382
test::RunFail,
384383
test::RunPassValgrind,
385384
test::MirOpt,

src/bootstrap/test.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,12 +773,6 @@ default_test!(CompileFail {
773773
suite: "compile-fail"
774774
});
775775

776-
default_test!(ParseFail {
777-
path: "src/test/parse-fail",
778-
mode: "parse-fail",
779-
suite: "parse-fail"
780-
});
781-
782776
default_test!(RunFail {
783777
path: "src/test/run-fail",
784778
mode: "run-fail",

src/ci/docker/wasm32-unknown/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \
3636
src/test/ui \
3737
src/test/run-pass \
3838
src/test/compile-fail \
39-
src/test/parse-fail \
4039
src/test/mir-opt \
4140
src/test/codegen-units \
4241
src/libcore \

src/etc/generate-keyword-tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"""
4545

4646
test_dir = os.path.abspath(
47-
os.path.join(os.path.dirname(__file__), '../test/parse-fail')
47+
os.path.join(os.path.dirname(__file__), '../test/ui/parser')
4848
)
4949

5050
for kw in sys.argv[1:]:

src/tools/compiletest/src/common.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use util::PathBufExt;
1919
#[derive(Clone, Copy, PartialEq, Debug)]
2020
pub enum Mode {
2121
CompileFail,
22-
ParseFail,
2322
RunFail,
2423
/// This now behaves like a `ui` test that has an implict `// run-pass`.
2524
RunPass,
@@ -56,7 +55,6 @@ impl FromStr for Mode {
5655
fn from_str(s: &str) -> Result<Mode, ()> {
5756
match s {
5857
"compile-fail" => Ok(CompileFail),
59-
"parse-fail" => Ok(ParseFail),
6058
"run-fail" => Ok(RunFail),
6159
"run-pass" => Ok(RunPass),
6260
"run-pass-valgrind" => Ok(RunPassValgrind),
@@ -80,7 +78,6 @@ impl fmt::Display for Mode {
8078
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
8179
let s = match *self {
8280
CompileFail => "compile-fail",
83-
ParseFail => "parse-fail",
8481
RunFail => "run-fail",
8582
RunPass => "run-pass",
8683
RunPassValgrind => "run-pass-valgrind",

src/tools/compiletest/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
139139
"",
140140
"mode",
141141
"which sort of compile tests to run",
142-
"(compile-fail|parse-fail|run-fail|run-pass|\
142+
"(compile-fail|run-fail|run-pass|\
143143
run-pass-valgrind|pretty|debug-info|incremental|mir-opt)",
144144
)
145145
.optflag("", "ignored", "run tests marked as ignored")

src/tools/compiletest/src/runtest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use common::CompareMode;
1212
use common::{expected_output_path, UI_EXTENSIONS, UI_FIXED, UI_STDERR, UI_STDOUT};
1313
use common::{output_base_dir, output_base_name, output_testname_unique};
1414
use common::{Codegen, CodegenUnits, DebugInfoBoth, DebugInfoGdb, DebugInfoLldb, Rustdoc};
15-
use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind};
15+
use common::{CompileFail, Pretty, RunFail, RunPass, RunPassValgrind};
1616
use common::{Config, TestPaths};
1717
use common::{Incremental, MirOpt, RunMake, Ui};
1818
use diff;
@@ -265,7 +265,7 @@ impl<'test> TestCx<'test> {
265265
/// revisions, exactly once, with revision == None).
266266
fn run_revision(&self) {
267267
match self.config.mode {
268-
CompileFail | ParseFail => self.run_cfail_test(),
268+
CompileFail => self.run_cfail_test(),
269269
RunFail => self.run_rfail_test(),
270270
RunPassValgrind => self.run_valgrind_test(),
271271
Pretty => self.run_pretty_test(),
@@ -296,7 +296,7 @@ impl<'test> TestCx<'test> {
296296

297297
fn should_compile_successfully(&self) -> bool {
298298
match self.config.mode {
299-
ParseFail | CompileFail => self.props.compile_pass,
299+
CompileFail => self.props.compile_pass,
300300
RunPass => true,
301301
Ui => self.props.compile_pass,
302302
Incremental => {
@@ -1741,7 +1741,7 @@ impl<'test> TestCx<'test> {
17411741
}
17421742

17431743
match self.config.mode {
1744-
CompileFail | ParseFail | Incremental => {
1744+
CompileFail | Incremental => {
17451745
// If we are extracting and matching errors in the new
17461746
// fashion, then you want JSON mode. Old-skool error
17471747
// patterns still match the raw compiler output.

0 commit comments

Comments
 (0)