Skip to content

Move remaning compile-fail tests that are rejected by the parser to pars... #22118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2015
Merged

Move remaning compile-fail tests that are rejected by the parser to pars... #22118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5550beb
Move remaning compile-fail tests that are rejected by the parser to p…
fhahn Feb 8, 2015
6824f13
Add pfail targets for parse-fail tests
fhahn Feb 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,7 @@ do
make_dir $h/test/run-pass-fulldeps
make_dir $h/test/run-fail
make_dir $h/test/compile-fail
make_dir $h/test/parse-fail
make_dir $h/test/compile-fail-fulldeps
make_dir $h/test/bench
make_dir $h/test/perf
Expand Down
17 changes: 13 additions & 4 deletions mk/tests.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ check-notidy: cleantmptestlogs cleantestlibs all check-stage2
check-lite: cleantestlibs cleantmptestlogs \
$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
check-stage2-rpass check-stage2-rpass-valgrind \
check-stage2-rfail check-stage2-cfail check-stage2-rmake
check-stage2-rfail check-stage2-cfail check-stage2-pfail check-stage2-rmake
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log

# Only check the 'reference' tests: rpass/cfail/rfail/rmake.
check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass check-stage2-rpass-valgrind \
check-stage2-rfail check-stage2-cfail check-stage2-rmake
check-stage2-rfail check-stage2-cfail check-stage2-pfail check-stage2-rmake
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log

# Only check the docs.
Expand Down Expand Up @@ -290,6 +290,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
check-stage$(1)-T-$(2)-H-$(3)-rpass-exec \
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
Expand Down Expand Up @@ -469,7 +470,8 @@ RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
RPASS_FULL_TESTS := $(RPASS_FULL_RS)
CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
RFAIL_TESTS := $(RFAIL_RS)
CFAIL_TESTS := $(CFAIL_RS) $(PFAIL_RS)
CFAIL_TESTS := $(CFAIL_RS)
PFAIL_TESTS := $(PFAIL_RS)
BENCH_TESTS := $(BENCH_RS)
PERF_TESTS := $(PERF_RS)
PRETTY_TESTS := $(PRETTY_RS)
Expand Down Expand Up @@ -507,6 +509,11 @@ CTEST_BUILD_BASE_cfail = compile-fail
CTEST_MODE_cfail = compile-fail
CTEST_RUNTOOL_cfail = $(CTEST_RUNTOOL)

CTEST_SRC_BASE_pfail = parse-fail
CTEST_BUILD_BASE_pfail = parse-fail
CTEST_MODE_pfail = parse-fail
CTEST_RUNTOOL_pfail = $(CTEST_RUNTOOL)

CTEST_SRC_BASE_bench = bench
CTEST_BUILD_BASE_bench = bench
CTEST_MODE_bench = run-pass
Expand Down Expand Up @@ -629,6 +636,7 @@ CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$
CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
CTEST_DEPS_pfail_$(1)-T-$(2)-H-$(3) = $$(PFAIL_TESTS)
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
CTEST_DEPS_debuginfo-gdb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_GDB_TESTS)
Expand Down Expand Up @@ -697,7 +705,7 @@ endif

endef

CTEST_NAMES = rpass rpass-valgrind rpass-full cfail-full rfail cfail bench perf debuginfo-gdb debuginfo-lldb codegen
CTEST_NAMES = rpass rpass-valgrind rpass-full cfail-full rfail cfail pfail bench perf debuginfo-gdb debuginfo-lldb codegen

$(foreach host,$(CFG_HOST), \
$(eval $(foreach target,$(CFG_TARGET), \
Expand Down Expand Up @@ -856,6 +864,7 @@ TEST_GROUPS = \
cfail-full \
rfail \
cfail \
pfail \
bench \
perf \
rmake \
Expand Down
3 changes: 3 additions & 0 deletions src/compiletest/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use std::str::FromStr;
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Mode {
CompileFail,
ParseFail,
RunFail,
RunPass,
RunPassValgrind,
Expand All @@ -29,6 +30,7 @@ impl FromStr for Mode {
fn from_str(s: &str) -> Result<Mode, ()> {
match s {
"compile-fail" => Ok(CompileFail),
"parse-fail" => Ok(ParseFail),
"run-fail" => Ok(RunFail),
"run-pass" => Ok(RunPass),
"run-pass-valgrind" => Ok(RunPassValgrind),
Expand All @@ -45,6 +47,7 @@ impl fmt::Display for Mode {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Display::fmt(match *self {
CompileFail => "compile-fail",
ParseFail => "parse-fail",
RunFail => "run-fail",
RunPass => "run-pass",
RunPassValgrind => "run-pass-valgrind",
Expand Down
2 changes: 1 addition & 1 deletion src/compiletest/compiletest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
reqopt("", "aux-base", "directory to find auxiliary test files", "PATH"),
reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
reqopt("", "mode", "which sort of compile tests to run",
"(compile-fail|run-fail|run-pass|run-pass-valgrind|pretty|debug-info)"),
"(compile-fail|parse-fail|run-fail|run-pass|run-pass-valgrind|pretty|debug-info)"),
optflag("", "ignored", "run tests marked as ignored"),
optopt("", "runtool", "supervisor program to run tests under \
(eg. emulator, valgrind)", "PROGRAM"),
Expand Down
5 changes: 3 additions & 2 deletions src/compiletest/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use self::TargetLocation::*;

use common::Config;
use common::{CompileFail, Pretty, RunFail, RunPass, RunPassValgrind, DebugInfoGdb};
use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind, DebugInfoGdb};
use common::{Codegen, DebugInfoLldb};
use errors;
use header::TestProps;
Expand Down Expand Up @@ -66,6 +66,7 @@ pub fn run_metrics(config: Config, testfile: String, mm: &mut MetricMap) {
debug!("loaded props");
match config.mode {
CompileFail => run_cfail_test(&config, &props, &testfile),
ParseFail => run_cfail_test(&config, &props, &testfile),
RunFail => run_rfail_test(&config, &props, &testfile),
RunPass => run_rpass_test(&config, &props, &testfile),
RunPassValgrind => run_valgrind_test(&config, &props, &testfile),
Expand All @@ -88,7 +89,7 @@ fn run_cfail_test(config: &Config, props: &TestProps, testfile: &Path) {
let proc_res = compile_test(config, props, testfile);

if proc_res.status.success() {
fatal_proc_rec("compile-fail test compiled successfully!",
fatal_proc_rec(&format!("{} test compiled successfully!", config.mode)[],
&proc_res);
}

Expand Down
0 src/test/parse-fail/mod_file_disambig.rs → src/test/compile-fail/mod_file_disambig.rs
View file
Open in desktop
File renamed without changes.
0 src/test/parse-fail/mod_file_not_owning.rs → src/test/compile-fail/mod_file_not_owning.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/ascii-only-character-escape.rs → ...parse-fail/ascii-only-character-escape.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr-before-eof.rs → src/test/parse-fail/attr-before-eof.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr-before-ext.rs → src/test/parse-fail/attr-before-ext.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr-before-let.rs → src/test/parse-fail/attr-before-let.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr-before-stmt.rs → src/test/parse-fail/attr-before-stmt.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr-dangling-in-fn.rs → src/test/parse-fail/attr-dangling-in-fn.rs
View file
Open in desktop
File renamed without changes.
0 ...test/compile-fail/attr-dangling-in-mod.rs → src/test/parse-fail/attr-dangling-in-mod.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/attr.rs → src/test/parse-fail/attr.rs
View file
Open in desktop
File renamed without changes.
0 ...st/compile-fail/attrs-after-extern-mod.rs → ...test/parse-fail/attrs-after-extern-mod.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/bad-char-literals.rs → src/test/parse-fail/bad-char-literals.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/bad-lit-suffixes.rs → src/test/parse-fail/bad-lit-suffixes.rs
View file
Open in desktop
File renamed without changes.
0 ...est/compile-fail/bad-value-ident-false.rs → src/test/parse-fail/bad-value-ident-false.rs
View file
Open in desktop
File renamed without changes.
0 ...test/compile-fail/bad-value-ident-true.rs → src/test/parse-fail/bad-value-ident-true.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/doc-before-attr.rs → src/test/parse-fail/doc-before-attr.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/doc-before-eof.rs → src/test/parse-fail/doc-before-eof.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/doc-before-extern-rbrace.rs → ...st/parse-fail/doc-before-extern-rbrace.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/doc-before-macro.rs → src/test/parse-fail/doc-before-macro.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/doc-before-rbrace.rs → src/test/parse-fail/doc-before-rbrace.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/doc-before-semi.rs → src/test/parse-fail/doc-before-semi.rs
View file
Open in desktop
File renamed without changes.
0 ...le-fail/extern-crate-as-no-string-help.rs → ...se-fail/extern-crate-as-no-string-help.rs
View file
Open in desktop
File renamed without changes.
0 ...ile-fail/generic-non-trailing-defaults.rs → ...rse-fail/generic-non-trailing-defaults.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/int-literal-too-large-span.rs → .../parse-fail/int-literal-too-large-span.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-10412.rs → src/test/parse-fail/issue-10412.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-12560-1.rs → src/test/parse-fail/issue-12560-1.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-14182.rs → src/test/parse-fail/issue-14182.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-17383.rs → src/test/parse-fail/issue-17383.rs
View file
Open in desktop
File renamed without changes.
0 ...est/compile-fail/issue-17718-const-mut.rs → src/test/parse-fail/issue-17718-const-mut.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-1802-2.rs → src/test/parse-fail/issue-1802-2.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-5544-a.rs → src/test/parse-fail/issue-5544-a.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-5544-b.rs → src/test/parse-fail/issue-5544-b.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/issue-8537.rs → src/test/parse-fail/issue-8537.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/keyword-as-as-identifier.rs → ...st/parse-fail/keyword-as-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/keyword-break-as-identifier.rs → ...parse-fail/keyword-break-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-else-as-identifier.rs → .../parse-fail/keyword-else-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-enum-as-identifier.rs → .../parse-fail/keyword-enum-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/keyword-extern-as-identifier.rs → ...arse-fail/keyword-extern-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/keyword-fn-as-identifier.rs → ...st/parse-fail/keyword-fn-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/keyword-for-as-identifier.rs → ...t/parse-fail/keyword-for-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/keyword-if-as-identifier.rs → ...st/parse-fail/keyword-if-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-impl-as-identifier.rs → .../parse-fail/keyword-impl-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/keyword-let-as-identifier.rs → ...t/parse-fail/keyword-let-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-loop-as-identifier.rs → .../parse-fail/keyword-loop-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/keyword-match-as-identifier.rs → ...parse-fail/keyword-match-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/keyword-mod-as-identifier.rs → ...t/parse-fail/keyword-mod-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/keyword-pub-as-identifier.rs → ...t/parse-fail/keyword-pub-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/keyword-return-as-identifier.rs → ...arse-fail/keyword-return-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-self-as-identifier.rs → .../parse-fail/keyword-self-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/keyword-static-as-identifier.rs → ...arse-fail/keyword-static-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/keyword-struct-as-identifier.rs → ...arse-fail/keyword-struct-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/keyword-super-as-identifier.rs → ...parse-fail/keyword-super-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/keyword-super.rs → src/test/parse-fail/keyword-super.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/keyword-trait-as-identifier.rs → ...parse-fail/keyword-trait-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...ompile-fail/keyword-type-as-identifier.rs → .../parse-fail/keyword-type-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/keyword-unsafe-as-identifier.rs → ...arse-fail/keyword-unsafe-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/keyword-use-as-identifier.rs → ...t/parse-fail/keyword-use-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail/keyword-while-as-identifier.rs → ...parse-fail/keyword-while-as-identifier.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/keyword.rs → src/test/parse-fail/keyword.rs
View file
Open in desktop
File renamed without changes.
0 ...fail/keywords-followed-by-double-colon.rs → ...fail/keywords-followed-by-double-colon.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/lex-bad-numeric-literals.rs → ...st/parse-fail/lex-bad-numeric-literals.rs
View file
Open in desktop
File renamed without changes.
0 ...lex-bare-cr-string-literal-doc-comment.rs → ...lex-bare-cr-string-literal-doc-comment.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/lifetime-no-keyword.rs → src/test/parse-fail/lifetime-no-keyword.rs
View file
Open in desktop
File renamed without changes.
0 ...t/compile-fail/lifetime-obsoleted-self.rs → ...est/parse-fail/lifetime-obsoleted-self.rs
View file
Open in desktop
File renamed without changes.
0 ...compile-fail/macros-no-semicolon-items.rs → ...t/parse-fail/macros-no-semicolon-items.rs
View file
Open in desktop
File renamed without changes.
0 ...t/compile-fail/no-binary-float-literal.rs → ...est/parse-fail/no-binary-float-literal.rs
View file
Open in desktop
File renamed without changes.
0 ...test/compile-fail/no-hex-float-literal.rs → src/test/parse-fail/no-hex-float-literal.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/no-unsafe-self.rs → src/test/parse-fail/no-unsafe-self.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/non-str-meta.rs → src/test/parse-fail/non-str-meta.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/obsolete-for-sized.rs → src/test/parse-fail/obsolete-for-sized.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/obsolete-proc.rs → src/test/parse-fail/obsolete-proc.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/qquote-1.rs → src/test/parse-fail/qquote-1.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/qquote-2.rs → src/test/parse-fail/qquote-2.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/regions-fn-bound.rs → src/test/parse-fail/regions-fn-bound.rs
View file
Open in desktop
File renamed without changes.
0 .../require-parens-for-chained-comparison.rs → .../require-parens-for-chained-comparison.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/struct-no-fields-2.rs → src/test/parse-fail/struct-no-fields-2.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/struct-no-fields-3.rs → src/test/parse-fail/struct-no-fields-3.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/struct-no-fields-4.rs → src/test/parse-fail/struct-no-fields-4.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/struct-no-fields-5.rs → src/test/parse-fail/struct-no-fields-5.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/struct-variant-no-fields.rs → ...st/parse-fail/struct-variant-no-fields.rs
View file
Open in desktop
File renamed without changes.
0 ...est/compile-fail/struct-variant-no-pub.rs → src/test/parse-fail/struct-variant-no-pub.rs
View file
Open in desktop
File renamed without changes.
0 ...est/compile-fail/syntax-trait-polarity.rs → src/test/parse-fail/syntax-trait-polarity.rs
View file
Open in desktop
File renamed without changes.
0 ...pile-fail/tag-variant-disr-non-nullary.rs → ...arse-fail/tag-variant-disr-non-nullary.rs
View file
Open in desktop
File renamed without changes.
0 ...ail/trailing-carriage-return-in-string.rs → ...ail/trailing-carriage-return-in-string.rs
View file
Open in desktop
File renamed without changes.
0 ...t/compile-fail/trailing-plus-in-bounds.rs → ...est/parse-fail/trailing-plus-in-bounds.rs
View file
Open in desktop
File renamed without changes.
0 .../compile-fail/trait-bounds-not-on-impl.rs → ...st/parse-fail/trait-bounds-not-on-impl.rs
View file
Open in desktop
File renamed without changes.
0 ...le-fail/type-parameters-in-field-exprs.rs → ...se-fail/type-parameters-in-field-exprs.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/unsized2.rs → src/test/parse-fail/unsized2.rs
View file
Open in desktop
File renamed without changes.
0 src/test/compile-fail/virtual-structs.rs → src/test/parse-fail/virtual-structs.rs
View file
Open in desktop
File renamed without changes.
0 .../where-clauses-no-bounds-or-predicates.rs → .../where-clauses-no-bounds-or-predicates.rs
View file
Open in desktop
File renamed without changes.