From d7916f8d4416e739aec3226adb0df1077e15a80a Mon Sep 17 00:00:00 2001 From: klutzy Date: Tue, 12 Aug 2014 23:23:10 +0900 Subject: [PATCH 1/2] regex: Enable test on Windows Fixes #13725 --- src/libregex/lib.rs | 3 +-- src/test/bench/shootout-regex-dna.rs | 2 -- .../compile-fail-fulldeps/syntax-extension-regex-invalid.rs | 2 -- .../syntax-extension-regex-unused-static.rs | 2 -- .../compile-fail-fulldeps/syntax-extension-regex-unused.rs | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs index fae3e5986806d..1d25a0c31d882 100644 --- a/src/libregex/lib.rs +++ b/src/libregex/lib.rs @@ -395,8 +395,7 @@ mod parse; mod re; mod vm; -// FIXME(#13725) windows needs fixing. -#[cfg(test, not(windows))] +#[cfg(test)] mod test; /// The `native` module exists to support the `regex!` macro. Do not use. diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs index 606f075d96db4..433d62c7e964b 100644 --- a/src/test/bench/shootout-regex-dna.rs +++ b/src/test/bench/shootout-regex-dna.rs @@ -38,8 +38,6 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED // OF THE POSSIBILITY OF SUCH DAMAGE. -// FIXME(#13725) windows needs fixing. -// ignore-windows // ignore-stage1 // ignore-cross-compile #12102 diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs index 64ef1abe7de90..32e0bff19918b 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// FIXME(#13725) windows needs fixing. -// ignore-windows // ignore-stage1 #![feature(phase)] diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs index 8d859c3f7ba2e..d7135bc5c916f 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// FIXME(#13725) windows needs fixing. -// ignore-windows // ignore-stage1 #![feature(phase)] diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs index 304ad7423b1b2..c17f3c6da5063 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// FIXME(#13725) windows needs fixing. -// ignore-windows // ignore-stage1 #![feature(phase)] From 480674694e364e94e6ef35520113a45f54b2fe6f Mon Sep 17 00:00:00 2001 From: klutzy Date: Tue, 12 Aug 2014 23:25:30 +0900 Subject: [PATCH 2/2] Remove workaround of #13793/#10872 LLVM assertion error has been fixed recently: http://llvm.org/bugs/show_bug.cgi?id=18993 Fixes #13793 --- src/test/run-make/no-intermediate-extras/foo.rs | 5 ----- src/test/run-pass/issue-14393.rs | 2 -- src/test/run-pass/test-runner-hides-main.rs | 1 - 3 files changed, 8 deletions(-) diff --git a/src/test/run-make/no-intermediate-extras/foo.rs b/src/test/run-make/no-intermediate-extras/foo.rs index 60a7f067476b0..e6c760257380c 100644 --- a/src/test/run-make/no-intermediate-extras/foo.rs +++ b/src/test/run-make/no-intermediate-extras/foo.rs @@ -7,8 +7,3 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. - -// FIXME #13793 -#[test] -fn test_dummy() { -} diff --git a/src/test/run-pass/issue-14393.rs b/src/test/run-pass/issue-14393.rs index 99af544e7865b..e97021b4869dd 100644 --- a/src/test/run-pass/issue-14393.rs +++ b/src/test/run-pass/issue-14393.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-windows: FIXME #13793 - fn main() { match ("", 1u) { (_, 42u) => (), diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs index 64b914a7438cd..9b658ee1dae53 100644 --- a/src/test/run-pass/test-runner-hides-main.rs +++ b/src/test/run-pass/test-runner-hides-main.rs @@ -9,7 +9,6 @@ // except according to those terms. // compile-flags:--test -// ignore-windows #10872 // ignore-pretty: does not work well with `--test` // Building as a test runner means that a synthetic main will be run,