about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-04-28 17:31:43 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-04-28 17:31:43 -0700
commit7b2a89fa757eccc34d99568c2efc83285f39d33d (patch)
treea0a486bb5fdeeeed075f5bc8258f7e5bd5755338
parenta3b28cb1f87a649e4bfe4a4b85fe591f9cb6c92f (diff)
downloadrust-7b2a89fa757eccc34d99568c2efc83285f39d33d.tar.gz
rust-7b2a89fa757eccc34d99568c2efc83285f39d33d.zip
test: Add a compile-fail-fulldeps test suite
Compile-fail tests for syntax extensions belong in this suite which has correct
dependencies on all artifacts rather than just the target artifacts.

Closes #13818
-rwxr-xr-xconfigure1
-rw-r--r--mk/tests.mk13
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs (renamed from src/test/compile-fail/syntax-extension-fourcc-bad-len.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs (renamed from src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs (renamed from src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs (renamed from src/test/compile-fail/syntax-extension-fourcc-non-literal.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs (renamed from src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs (renamed from src/test/compile-fail/syntax-extension-hexfloat-bad-lits.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs (renamed from src/test/compile-fail/syntax-extension-hexfloat-bad-types.rs)0
-rw-r--r--src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs (renamed from src/test/compile-fail/syntax-extension-regex-invalid.rs)0
10 files changed, 13 insertions, 1 deletions
diff --git a/configure b/configure
index 983be4e8a0c..0f3561dd7b5 100755
--- a/configure
+++ b/configure
@@ -803,6 +803,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/compile-fail-fulldeps
     make_dir $h/test/bench
     make_dir $h/test/perf
     make_dir $h/test/pretty
diff --git a/mk/tests.mk b/mk/tests.mk
index 9fc1c7390cc..1b80f553fbc 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -287,6 +287,7 @@ check-stage$(1)-T-$(2)-H-$(3)-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)-rpass-full-exec			\
+	check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec			\
 	check-stage$(1)-T-$(2)-H-$(3)-rmake-exec			\
         check-stage$(1)-T-$(2)-H-$(3)-crates-exec                       \
         check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec                   \
@@ -440,6 +441,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
 RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
 RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
 RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
+CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
+CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
 RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
 RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
 CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
@@ -456,6 +459,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
 
 RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
 RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
+CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
 RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
 CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
 BENCH_TESTS := $(BENCH_RS)
@@ -474,6 +478,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
 CTEST_MODE_rpass-full = run-pass
 CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
 
+CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
+CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
+CTEST_MODE_cfail-full = compile-fail
+CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)
+
 CTEST_SRC_BASE_rfail = run-fail
 CTEST_BUILD_BASE_rfail = run-fail
 CTEST_MODE_rfail = run-fail
@@ -572,6 +581,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) :=						\
 
 CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
 CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
+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_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
@@ -640,7 +650,7 @@ endif
 
 endef
 
-CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
+CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo codegen
 
 $(foreach host,$(CFG_HOST), \
  $(eval $(foreach target,$(CFG_TARGET), \
@@ -783,6 +793,7 @@ TEST_GROUPS = \
 	$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
 	rpass \
 	rpass-full \
+	cfail-full \
 	rfail \
 	cfail \
 	bench \
diff --git a/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs
index fbcdf55f1ac..fbcdf55f1ac 100644
--- a/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs
diff --git a/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs
index 569b54b93fb..569b54b93fb 100644
--- a/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs
diff --git a/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs
index c0e2304354c..c0e2304354c 100644
--- a/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs
diff --git a/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs
index 536594f3063..536594f3063 100644
--- a/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs
diff --git a/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs
index 8a0b0856d24..8a0b0856d24 100644
--- a/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs
diff --git a/src/test/compile-fail/syntax-extension-hexfloat-bad-lits.rs b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs
index 1cd4f654d2e..1cd4f654d2e 100644
--- a/src/test/compile-fail/syntax-extension-hexfloat-bad-lits.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs
diff --git a/src/test/compile-fail/syntax-extension-hexfloat-bad-types.rs b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs
index 4a6475cea96..4a6475cea96 100644
--- a/src/test/compile-fail/syntax-extension-hexfloat-bad-types.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs
diff --git a/src/test/compile-fail/syntax-extension-regex-invalid.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs
index 0e072dc1c06..0e072dc1c06 100644
--- a/src/test/compile-fail/syntax-extension-regex-invalid.rs
+++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs