auto merge of #13288 : alexcrichton/rust/remove-check-fast, r=brson

Rebasing of #12304.

mk/tests.mk

@@ -183,6 +183,9 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
 check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
+# NOTE: Remove after reprogramming windows bots
+check-fast: check-lite
+
 .PHONY: cleantmptestlogs cleantestlibs
 
 cleantmptestlogs:
@@ -875,69 +878,9 @@ $(foreach crate,$(TEST_CRATES), \
  $(eval $(call DEF_CHECK_CRATE,$(crate))))
 
 ######################################################################
-# check-fast rules
+# RMAKE rules
 ######################################################################
 
-FT := run_pass_stage2
-FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
-FT_DRIVER := $(FT)_driver
-
-GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
-
-tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
-		$(RPASS_TESTS) \
-		$(S)src/etc/combine-tests.py
-	@$(call E, check: building combined stage2 test runner)
-	$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
-
-define DEF_CHECK_FAST_FOR_T_H
-# $(1) unused
-# $(2) target triple
-# $(3) host triple
-
-$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
-		tmp/$$(FT).rc \
-		$$(SREQ2_T_$(2)_H_$(3))
-	@$$(call E, oxidize: $$@)
-	$$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \
-	  -L "$$(RT_OUTPUT_DIR_$(2))"
-
-$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
-		tmp/$$(FT_DRIVER).rs \
-		$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
-		$$(SREQ2_T_$(2)_H_$(3))
-	@$$(call E, oxidize: $$@ $$<)
-	$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \
-	  -L "$$(RT_OUTPUT_DIR_$(2))"
-
-$(3)/test/$$(FT_DRIVER)-$(2).out: \
-		$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)) \
-		$$(SREQ2_T_$(2)_H_$(3))
-	$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) \
-	--logfile tmp/$$(FT_DRIVER)-$(2).log
-
-check-fast-T-$(2)-H-$(3):     			\
-	$(3)/test/$$(FT_DRIVER)-$(2).out
-
-endef
-
-$(foreach host,$(CFG_HOST), \
- $(eval $(foreach target,$(CFG_TARGET), \
-   $(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
-
-check-fast: tidy check-fast-H-$(CFG_BUILD) \
-	    $(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
-
-define DEF_CHECK_FAST_FOR_H
-
-check-fast-H-$(1): 		check-fast-T-$(1)-H-$(1)
-
-endef
-
-$(foreach host,$(CFG_HOST),			\
- $(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
-
 RMAKE_TESTS := $(shell ls -d $(S)src/test/run-make/*/)
 RMAKE_TESTS := $(RMAKE_TESTS:$(S)src/test/run-make/%/=%)
 
@@ -961,6 +904,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	@rm -rf $(3)/test/run-make/$$*
 	@mkdir -p $(3)/test/run-make/$$*
 	$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
+        $$(MAKE) \
 	    $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	    $(3)/test/run-make/$$* \
 	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \

src/etc/combine-tests.py

@@ -1,91 +0,0 @@
-# Copyright 2011-2014 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.
-
-# This combines all the working run-pass tests into a single large crate so we
-# can run it "fast": spawning zillions of windows processes is our major build
-# bottleneck (and it doesn't hurt to run faster on other platforms as well).
-
-import sys
-import os
-import codecs
-
-
-def scrub(b):
-    if sys.version_info >= (3,) and type(b) == bytes:
-        return b.decode('ascii')
-    else:
-        return b
-
-src_dir = scrub(os.getenv("CFG_SRC_DIR"))
-if not src_dir:
-    raise Exception("missing env var CFG_SRC_DIR")
-
-run_pass = os.path.join(src_dir, "src", "test", "run-pass")
-run_pass = os.path.abspath(run_pass)
-stage2_tests = []
-
-for t in os.listdir(run_pass):
-    if t.endswith(".rs") and not (
-            t.startswith(".") or t.startswith("#") or t.startswith("~")):
-        f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
-        s = f.read()
-        if not ("ignore-test" in s or
-                "ignore-fast" in s or
-                "ignore-win32" in s):
-            if not "pub fn main" in s and "fn main" in s:
-                print("Warning: no public entry point in " + t)
-            stage2_tests.append(t)
-        f.close()
-
-stage2_tests.sort()
-
-c = open("tmp/run_pass_stage2.rc", "w")
-i = 0
-c.write(
-"""
-// AUTO-GENERATED FILE: DO NOT EDIT
-#[crate_id=\"run_pass_stage2#0.1\"];
-#[crate_id=\"run_pass_stage2#0.1\"];
-#[feature(globs, macro_rules, struct_variant, managed_boxes)];
-#![allow(warnings)]
-extern crate collections;
-"""
-)
-for t in stage2_tests:
-    p = os.path.join(run_pass, t)
-    p = p.replace("\\", "\\\\")
-    c.write("#[path = \"%s\"]" % p)
-    c.write("pub mod t_%d;\n" % i)
-    i += 1
-c.close()
-
-
-d = open("tmp/run_pass_stage2_driver.rs", "w")
-d.write(
-"""
-// AUTO-GENERATED FILE: DO NOT EDIT
-#[feature(globs, managed_boxes)];
-extern crate run_pass_stage2;
-use run_pass_stage2::*;
-use std::io;
-use std::io::Writer;
-#[allow(warnings)]
-fn main() {
-    let mut out = io::stdout();
-"""
-)
-i = 0
-for t in stage2_tests:
-    p = os.path.join("test", "run-pass", t)
-    p = p.replace("\\", "\\\\")
-    d.write("    out.write(\"run-pass [stage2]: %s\\n\".as_bytes());\n" % p)
-    d.write("    t_%d::main();\n" % i)
-    i += 1
-d.write("}\n")

src/etc/maketest.py

@@ -12,12 +12,18 @@ import subprocess
 import os
 import sys
 
-os.putenv('RUSTC', os.path.abspath(sys.argv[2]))
-os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
-os.putenv('CC', sys.argv[4])
-os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
-filt = sys.argv[6]
-ldpath = sys.argv[7]
+# FIXME #12303 these tests are broken on windows
+if os.name == 'nt':
+    print 'ignoring make tests on windows'
+    sys.exit(0)
+
+make = sys.argv[2]
+os.putenv('RUSTC', os.path.abspath(sys.argv[3]))
+os.putenv('TMPDIR', os.path.abspath(sys.argv[4]))
+os.putenv('CC', sys.argv[5])
+os.putenv('RUSTDOC', os.path.abspath(sys.argv[6]))
+filt = sys.argv[7]
+ldpath = sys.argv[8]
 if ldpath != '':
     os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
 
@@ -25,7 +31,7 @@ if not filt in sys.argv[1]:
     sys.exit(0)
 print('maketest: ' + os.path.basename(os.path.dirname(sys.argv[1])))
 
-proc = subprocess.Popen(['make', '-C', sys.argv[1]],
+proc = subprocess.Popen([make, '-C', sys.argv[1]],
                         stdout = subprocess.PIPE,
                         stderr = subprocess.PIPE)
 out, err = proc.communicate()

src/libnative/io/process.rs

@@ -40,6 +40,9 @@ pub struct Process {
 
     /// None until finish() is called.
     exit_code: Option<p::ProcessExit>,
+
+    /// Manually delivered signal
+    exit_signal: Option<int>,
 }
 
 impl Process {
@@ -107,7 +110,12 @@ impl Process {
 
         match res {
             Ok(res) => {
-                Ok((Process { pid: res.pid, handle: res.handle, exit_code: None },
+                Ok((Process {
+                        pid: res.pid,
+                        handle: res.handle,
+                        exit_code: None,
+                        exit_signal: None,
+                    },
                     ret_io))
             }
             Err(e) => Err(e)
@@ -127,6 +135,14 @@ impl rtio::RtioProcess for Process {
             Some(code) => code,
             None => {
                 let code = waitpid(self.pid);
+                // On windows, waitpid will never return a signal. If a signal
+                // was successfully delivered to the process, however, we can
+                // consider it as having died via a signal.
+                let code = match self.exit_signal {
+                    None => code,
+                    Some(signal) if cfg!(windows) => p::ExitSignal(signal),
+                    Some(..) => code,
+                };
                 self.exit_code = Some(code);
                 code
             }
@@ -157,7 +173,14 @@ impl rtio::RtioProcess for Process {
             }),
             None => {}
         }
-        return unsafe { killpid(self.pid, signum) };
+
+        // A successfully delivered signal that isn't 0 (just a poll for being
+        // alive) is recorded for windows (see wait())
+        match unsafe { killpid(self.pid, signum) } {
+            Ok(()) if signum == 0 => Ok(()),
+            Ok(()) => { self.exit_signal = Some(signum); Ok(()) }
+            Err(e) => Err(e),
+        }
     }
 }
 
@@ -256,31 +279,37 @@ fn spawn_process_os(config: p::ProcessConfig,
 
         let cur_proc = GetCurrentProcess();
 
-        let orig_std_in = get_osfhandle(in_fd) as HANDLE;
-        if orig_std_in == INVALID_HANDLE_VALUE as HANDLE {
-            fail!("failure in get_osfhandle: {}", os::last_os_error());
-        }
-        if DuplicateHandle(cur_proc, orig_std_in, cur_proc, &mut si.hStdInput,
-                           0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
-            fail!("failure in DuplicateHandle: {}", os::last_os_error());
+        if in_fd != -1 {
+            let orig_std_in = get_osfhandle(in_fd) as HANDLE;
+            if orig_std_in == INVALID_HANDLE_VALUE as HANDLE {
+                fail!("failure in get_osfhandle: {}", os::last_os_error());
+            }
+            if DuplicateHandle(cur_proc, orig_std_in, cur_proc, &mut si.hStdInput,
+                               0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
+                fail!("failure in DuplicateHandle: {}", os::last_os_error());
+            }
         }
 
-        let orig_std_out = get_osfhandle(out_fd) as HANDLE;
-        if orig_std_out == INVALID_HANDLE_VALUE as HANDLE {
-            fail!("failure in get_osfhandle: {}", os::last_os_error());
-        }
-        if DuplicateHandle(cur_proc, orig_std_out, cur_proc, &mut si.hStdOutput,
-                           0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
-            fail!("failure in DuplicateHandle: {}", os::last_os_error());
+        if out_fd != -1 {
+            let orig_std_out = get_osfhandle(out_fd) as HANDLE;
+            if orig_std_out == INVALID_HANDLE_VALUE as HANDLE {
+                fail!("failure in get_osfhandle: {}", os::last_os_error());
+            }
+            if DuplicateHandle(cur_proc, orig_std_out, cur_proc, &mut si.hStdOutput,
+                               0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
+                fail!("failure in DuplicateHandle: {}", os::last_os_error());
+            }
         }
 
-        let orig_std_err = get_osfhandle(err_fd) as HANDLE;
-        if orig_std_err == INVALID_HANDLE_VALUE as HANDLE {
-            fail!("failure in get_osfhandle: {}", os::last_os_error());
-        }
-        if DuplicateHandle(cur_proc, orig_std_err, cur_proc, &mut si.hStdError,
-                           0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
-            fail!("failure in DuplicateHandle: {}", os::last_os_error());
+        if err_fd != -1 {
+            let orig_std_err = get_osfhandle(err_fd) as HANDLE;
+            if orig_std_err == INVALID_HANDLE_VALUE as HANDLE {
+                fail!("failure in get_osfhandle: {}", os::last_os_error());
+            }
+            if DuplicateHandle(cur_proc, orig_std_err, cur_proc, &mut si.hStdError,
+                               0, TRUE, DUPLICATE_SAME_ACCESS) == FALSE {
+                fail!("failure in DuplicateHandle: {}", os::last_os_error());
+            }
         }
 
         let cmd = make_command_line(config.program, config.args);
@@ -307,9 +336,9 @@ fn spawn_process_os(config: p::ProcessConfig,
             })
         });
 
-        assert!(CloseHandle(si.hStdInput) != 0);
-        assert!(CloseHandle(si.hStdOutput) != 0);
-        assert!(CloseHandle(si.hStdError) != 0);
+        if in_fd != -1 { assert!(CloseHandle(si.hStdInput) != 0); }
+        if out_fd != -1 { assert!(CloseHandle(si.hStdOutput) != 0); }
+        if err_fd != -1 { assert!(CloseHandle(si.hStdError) != 0); }
 
         match create_err {
             Some(err) => return Err(err),

src/test/auxiliary/crateresolve7x.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve_calories-1.rs
 // aux-build:crateresolve_calories-2.rs
 

src/test/auxiliary/issue-2414-b.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 #[crate_id="b#0.1"];
 #[crate_type = "lib"];

src/test/auxiliary/issue-9906.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast windows doesn't like extern crate
 // aux-build:issue-9906.rs
 
 pub use other::FooBar;

src/test/auxiliary/lang-item-public.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_std];
+#![no_std]
 
 #[lang="fail_"]
 fn fail(_: *i8, _: *i8, _: uint) -> ! { loop {} }

src/test/compile-fail/ambig_impl_2_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast aux-build
 // aux-build:ambig_impl_2_lib.rs
 extern crate ambig_impl_2_lib;
 use ambig_impl_2_lib::me;

src/test/compile-fail/asm-in-bad-modifier.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 fn foo(x: int) { println!("{}", x); }

src/test/compile-fail/asm-misplaced-option.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 // ignore-android
 
 #![feature(asm)]

src/test/compile-fail/asm-out-assign-imm.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 fn foo(x: int) { println!("{}", x); }

src/test/compile-fail/asm-out-no-modifier.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 fn foo(x: int) { println!("{}", x); }

src/test/compile-fail/asm-out-read-uninit.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 fn foo(x: int) { println!("{}", x); }

src/test/compile-fail/builtin-superkinds-in-metadata.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 // aux-build:trait_superkinds_in_metadata.rs
 

src/test/compile-fail/coherence_inherent_cc.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:coherence_inherent_cc_lib.rs
 
 // Tests that methods that implement a trait cannot be invoked

src/test/compile-fail/crateresolve5.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve5-1.rs
 // aux-build:crateresolve5-2.rs
 

src/test/compile-fail/functional-struct-update-noncopyable.rs

@@ -10,8 +10,8 @@
 
 // issue 7327
 
-// ignore-fast #7103
 extern crate sync;
+
 use sync::Arc;
 
 struct A { y: Arc<int>, x: Arc<int> }

src/test/compile-fail/gated-non-ascii-idents.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast feature doesn't work.
 
 #![feature(struct_variant)]
 

src/test/compile-fail/gated-trace_macros.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast feature doesn't work.
 
 fn main() {
     trace_macros!(true); //~ ERROR: `trace_macros` is not stable

src/test/compile-fail/issue-5806.rs

@@ -18,6 +18,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-freebsd FIXME #12460
+
 #[path = "../compile-fail"]
 mod foo; //~ ERROR: illegal operation on a directory
 

src/test/compile-fail/lint-stability.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast aux-build
 // aux-build:lint_stability.rs
 
 #![feature(globs)]

src/test/compile-fail/private-method-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_5.rs
 extern crate cci_class_5;
 use cci_class_5::kitties::cat;

src/test/compile-fail/redundant-link-args.rs

@@ -0,0 +1,29 @@
+// Copyright 2012 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-test
+
+// error-pattern:library 'm' already added: can't specify link_args.
+
+/* I think it should undefined to have multiple modules that link in the same
+  library, but provide different link arguments. Unfortunately we don't track
+  link_args by module -- they are just appended as discovered into the crate
+  store -- but for now, it should be an error to provide link_args on a module
+  that's already been included (with or without link_args). */
+
+#[link_name= "m"]
+#[link_args="-foo"]             // this could have been elided.
+extern {
+}
+
+#[link_name= "m"]
+#[link_args="-bar"]             // this is the actual error trigger.
+extern {
+}

src/test/compile-fail/trace_macros-format.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast feature doesn't work
 #![feature(macro_rules, trace_macros)]
 
 fn main() {

src/test/compile-fail/xc-private-method.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:xc_private_method_lib.rs
 
 extern crate xc_private_method_lib;

src/test/compile-fail/xc-private-method2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:xc_private_method_lib.rs
 
 extern crate xc_private_method_lib;

src/test/pretty/raw-str-nonexpr.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 // pp-exact
 
 #![feature(asm)]

src/test/run-make/c-link-to-rust-staticlib/Makefile

@@ -4,6 +4,8 @@ ifneq ($(shell uname),Darwin)
 	EXTRAFLAGS := -lm -lrt -ldl -lpthread
 endif
 
+# FIXME
+ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) foo.rs
 	ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo)
@@ -11,3 +13,8 @@ all:
 	$(call RUN,bar)
 	rm $(call STATICLIB,foo*)
 	$(call RUN,bar)
+
+else
+all:
+
+endif

src/test/run-make/dep-info-custom/Makefile

@@ -1,5 +1,7 @@
 -include ../tools.mk
 
+# FIXME
+ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) --dep-info $(TMPDIR)/custom-deps-file.d --crate-type=lib lib.rs
 	sleep 1
@@ -10,3 +12,7 @@ all:
 	pwd
 	$(MAKE) -drf Makefile.foo
 	rm $(TMPDIR)/done && exit 1 || exit 0
+else
+all:
+
+endif

src/test/run-make/dep-info/Makefile

@@ -1,12 +1,18 @@
 -include ../tools.mk
 
+ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) --dep-info --crate-type=lib lib.rs
-	sleep 1
+	sleep 2
 	touch foo.rs
 	-rm -f $(TMPDIR)/done
 	$(MAKE) -drf Makefile.foo
+	sleep 2
 	rm $(TMPDIR)/done
 	pwd
 	$(MAKE) -drf Makefile.foo
 	rm $(TMPDIR)/done && exit 1 || exit 0
+else
+all:
+
+endif

src/test/run-make/lto-smoke-c/Makefile

@@ -1,8 +1,13 @@
 -include ../tools.mk
 
-ifneq ($(shell uname),Darwin)
+ifeq ($(shell uname),Darwin)
+else
+ifeq ($(shell uname),FreeBSD)
+	EXTRAFLAGS := -lm -lpthread -lgcc_s
+else
 	EXTRAFLAGS := -lm -lrt -ldl -lpthread
 endif
+endif
 
 # Apparently older versions of GCC segfault if -g is passed...
 CC := $(CC:-g=)

src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

@@ -10,7 +10,6 @@
 
 // aux-build:macro_crate_outlive_expansion_phase.rs
 // ignore-stage1
-// ignore-fast
 // ignore-android
 // ignore-cross-compile #12102
 

src/test/run-pass-fulldeps/macro-crate.rs

@@ -10,7 +10,6 @@
 
 // aux-build:macro_crate_test.rs
 // ignore-stage1
-// ignore-fast
 // ignore-android
 // ignore-cross-compile #12102
 

src/test/run-pass-fulldeps/phase-syntax-link-does-resolve.rs

@@ -10,7 +10,6 @@
 
 // aux-build:macro_crate_test.rs
 // ignore-stage1
-// ignore-fast
 // ignore-android
 // force-host
 
@@ -19,7 +18,6 @@
 // This implies that both versions are the host architecture, meaning this test
 // must also be compiled with the host arch.
 //
-// Hence, ignore-stage1 because macros are unstable around there, ignore-fast
 // because this doesn't work with that test runner, ignore-android because it
 // can't run host binaries, and force-host to make this test build as the host
 // arch.

src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // ignore-android
 #![feature(quote)]
 #[deny(unused_variable)];

src/test/run-pass-fulldeps/syntax-extension-fourcc.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast Feature gating doesn't work
 // ignore-stage1
 // ignore-pretty
 // ignore-cross-compile

src/test/run-pass-fulldeps/syntax-extension-hexfloat.rs

@@ -11,7 +11,6 @@
 // ignore-stage1
 // ignore-pretty
 // ignore-cross-compile #12102
-// ignore-fast
 
 #![feature(phase)]
 #[phase(syntax)]

src/test/run-pass/anon-extern-mod-cross-crate-2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // ignore-pretty
 // aux-build:anon-extern-mod-cross-crate-1.rs
 extern crate anonexternmod;

src/test/run-pass/anon_trait_static_method_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:anon_trait_static_method_lib.rs
 
 extern crate anon_trait_static_method_lib;

src/test/run-pass/argument-passing.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 struct X {
     x: int

src/test/run-pass/asm-concat-src.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 pub fn main() {

src/test/run-pass/asm-in-out-operand.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 #[cfg(target_arch = "x86")]

src/test/run-pass/asm-out-assign.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #[feature] doesn't work with check-fast
 #![feature(asm)]
 
 #[cfg(target_arch = "x86")]

src/test/run-pass/attr-main-2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 pub fn main() {
     fail!()

src/test/run-pass/attr-main.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 #[main]
 fn foo() {

src/test/run-pass/attr-shebang.rs

@@ -2,4 +2,3 @@
 #![feature(bogus)]
 pub fn main() { }
 // ignore-license
-// ignore-fast

src/test/run-pass/attr-start.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//ignore-fast
 
 #[start]
 fn start(_argc: int, _argv: **u8) -> int {

src/test/run-pass/attr.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
-
 #[main]
 fn foo() {
 }

src/test/run-pass/auto-encode.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // ignore-test FIXME(#5121)
-// ignore-fast
 
 #[feature(managed_boxes)];
 

src/test/run-pass/backtrace.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // ignore-win32 FIXME #13259
-// ignore-fast this is executing itself
 #![no_uv]
 
 extern crate native;

src/test/run-pass/bind-by-move.rs

@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 extern crate sync;
+
 use sync::Arc;
 fn dispose(_x: Arc<bool>) { }
 

src/test/run-pass/bitv-perf-test.rs

@@ -1,4 +1,3 @@
-// ignore-fast
 
 // Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at

src/test/run-pass/block-iter-1.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 
 fn iter_vec<T>(v: Vec<T> , f: |&T|) { for x in v.iter() { f(x); } }

src/test/run-pass/block-iter-2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 
 fn iter_vec<T>(v: Vec<T> , f: |&T|) { for x in v.iter() { f(x); } }

src/test/run-pass/builtin-superkinds-capabilities-xc.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 // aux-build:trait_superkinds_in_metadata.rs
 

src/test/run-pass/builtin-superkinds-in-metadata.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 // aux-build:trait_superkinds_in_metadata.rs
 

src/test/run-pass/capturing-logging.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // ignore-android (FIXME #11419)
 // exec-env:RUST_LOG=info
 

src/test/run-pass/cci_borrow.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_borrow_lib.rs
 
 #[feature(managed_boxes)];

src/test/run-pass/cci_capture_clause.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_capture_clause.rs
-// ignore-fast
 
 // This test makes sure we can do cross-crate inlining on functions
 // that use capture clauses.

src/test/run-pass/cci_impl_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_impl_lib.rs
 
 extern crate cci_impl_lib;

src/test/run-pass/cci_iter_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_iter_lib.rs
 
 extern crate cci_iter_lib;

src/test/run-pass/cci_nested_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_nested_lib.rs
 
 #[feature(globs, managed_boxes)];

src/test/run-pass/cci_no_inline_exe.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_no_inline_lib.rs
 
 extern crate cci_no_inline_lib;

src/test/run-pass/cfg-macros-foo.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast compile-flags directive doesn't work for check-fast
 // compile-flags: --cfg foo
 
 // check that cfg correctly chooses between the macro impls (see also

src/test/run-pass/cfg-macros-notfoo.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast compile-flags directive doesn't work for check-fast
 // compile-flags:
 
 // check that cfg correctly chooses between the macro impls (see also

src/test/run-pass/cfg_inner_static.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cfg_inner_static.rs
-// ignore-fast
 
 extern crate cfg_inner_static;
 

src/test/run-pass/cfgs-on-items.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // compile-flags: --cfg fooA --cfg fooB
 
 // fooA AND !bar

src/test/run-pass/class-cast-to-trait-cross-crate-2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_cast.rs
 extern crate cci_class_cast;
 use std::to_str::ToStr;

src/test/run-pass/class-cast-to-trait.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-freebsd FIXME fails on BSD
+
 #[feature(managed_boxes)];
 
 trait noisy {

src/test/run-pass/class-exports.rs

@@ -1,4 +1,3 @@
-// ignore-fast
 
 // Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at

src/test/run-pass/class-impl-very-parameterized-trait.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 use std::cmp;
 

src/test/run-pass/class-implement-trait-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_trait.rs
 extern crate cci_class_trait;
 use cci_class_trait::animals::noisy;

src/test/run-pass/class-implement-traits.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 trait noisy {
     fn speak(&mut self);

src/test/run-pass/class-method-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_2.rs
 extern crate cci_class_2;
 use cci_class_2::kitties::cat;

src/test/run-pass/class-methods-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_3.rs
 extern crate cci_class_3;
 use cci_class_3::kitties::cat;

src/test/run-pass/class-poly-methods-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_6.rs
 extern crate cci_class_6;
 use cci_class_6::kitties::cat;

src/test/run-pass/class-separate-impl.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
-
 use std::fmt;
 
 struct cat {

src/test/run-pass/classes-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class_4.rs
 extern crate cci_class_4;
 use cci_class_4::kitties::cat;

src/test/run-pass/classes-simple-cross-crate.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_class.rs
 extern crate cci_class;
 use cci_class::kitties::cat;

src/test/run-pass/closure-inference.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 
 fn foo(i: int) -> int { i + 1 }
 

src/test/run-pass/conditional-compile.rs

@@ -1,4 +1,3 @@
-// ignore-fast
 
 // Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at

src/test/run-pass/conditional-debug-macro-off.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast exec-env directive doesn't work for check-fast
 // compile-flags: --cfg ndebug
 // exec-env:RUST_LOG=conditional-debug-macro-off=4
 

src/test/run-pass/conditional-debug-macro-on.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast compile-flags directive doesn't work for check-fast
 // exec-env:RUST_LOG=conditional-debug-macro-on=4
 
 pub fn main() {

src/test/run-pass/const-cross-crate-const.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_const.rs
 
 extern crate cci_const;

src/test/run-pass/const-cross-crate-extern.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_const.rs
 
 extern crate cci_const;

src/test/run-pass/core-run-destroy.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // ignore-pretty
 // compile-flags:--test
 

src/test/run-pass/crate-method-reexport-grrrrrrr.rs

@@ -14,7 +14,6 @@
 // name_pool::methods impl in the other crate is reachable from this
 // crate.
 
-// ignore-fast
 // aux-build:crate-method-reexport-grrrrrrr2.rs
 
 extern crate crate_method_reexport_grrrrrrr2;

src/test/run-pass/crateresolve1.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve1-1.rs
 // aux-build:crateresolve1-2.rs
 // aux-build:crateresolve1-3.rs

src/test/run-pass/crateresolve2.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve2-1.rs
 // aux-build:crateresolve2-2.rs
 // aux-build:crateresolve2-3.rs

src/test/run-pass/crateresolve3.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve3-1.rs
 // aux-build:crateresolve3-2.rs
 

src/test/run-pass/crateresolve4.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve4a-1.rs
 // aux-build:crateresolve4a-2.rs
 // aux-build:crateresolve4b-1.rs

src/test/run-pass/crateresolve5.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve5-1.rs
 // aux-build:crateresolve5-2.rs
 

src/test/run-pass/crateresolve8.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:crateresolve8-1.rs
 
 #[crate_id="crateresolve8#0.1"];

src/test/run-pass/cross-crate-const-pat.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:cci_const.rs
 
 extern crate cci_const;

src/test/run-pass/cross-crate-newtype-struct-pat.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast
 // aux-build:newtype_struct_xc.rs
 
 extern crate newtype_struct_xc;

src/test/run-pass/deep-vector.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // ignore-test
-// ignore-fast
 //
 // Too big for our poor macro infrastructure.
 

src/test/run-pass/deep-vector2.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // ignore-test
-// ignore-fast
 //
 // Too big for our poor macro infrastructure.
 

src/test/run-pass/deriving-encodable-decodable.rs

@@ -11,7 +11,6 @@
 // This actually tests a lot more than just encodable/decodable, but it gets the
 // job done at least
 
-// ignore-fast
 // ignore-test FIXME(#5121)
 
 #[feature(struct_variant, managed_boxes)];

src/test/run-pass/deriving-global.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-fast #7103 `extern crate` does not work on check-fast
 // ignore-pretty - does not converge
 
 // Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT