---

yaml
---
r: 110225
b: refs/heads/auto
c: e6b1cc6
h: refs/heads/master
i:
  110223: 453e8bc
v: v3

Author: jbcrail

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: e415c25bcd81dc1f9a5a3d25d9b48ed2d545336b
+refs/heads/auto: e6b1cc6ae194449e5231bb13d8853af1efbe52c4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/README.md

@@ -59,7 +59,7 @@ documentation.
 
 [repo]: https://github.com/mozilla/rust
 [tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
-[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
+[tutorial]: http://static.rust-lang.org/doc/nightly/tutorial.html
 
 ## Notes
 

branches/auto/mk/tests.mk

@@ -183,9 +183,6 @@ 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:
@@ -878,9 +875,69 @@ $(foreach crate,$(TEST_CRATES), \
  $(eval $(call DEF_CHECK_CRATE,$(crate))))
 
 ######################################################################
-# RMAKE rules
+# check-fast 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/%/=%)
 
@@ -904,7 +961,6 @@ $(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))" \

branches/auto/src/compiletest/procsrv.rs

@@ -84,8 +84,8 @@ pub fn run(lib_path: &str,
 
             Some(Result {
                 status: status,
-                out: str::from_utf8(output.as_slice()).unwrap().to_owned(),
-                err: str::from_utf8(error.as_slice()).unwrap().to_owned()
+                out: str::from_utf8_owned(output).unwrap(),
+                err: str::from_utf8_owned(error).unwrap()
             })
         },
         Err(..) => None

branches/auto/src/compiletest/runtest.rs

@@ -153,7 +153,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
         match props.pp_exact { Some(_) => 1, None => 2 };
 
     let src = File::open(testfile).read_to_end().unwrap();
-    let src = str::from_utf8(src.as_slice()).unwrap().to_owned();
+    let src = str::from_utf8_owned(src).unwrap();
     let mut srcs = vec!(src);
 
     let mut round = 0;
@@ -177,7 +177,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
         Some(ref file) => {
             let filepath = testfile.dir_path().join(file);
             let s = File::open(&filepath).read_to_end().unwrap();
-            str::from_utf8(s.as_slice()).unwrap().to_owned()
+            str::from_utf8_owned(s).unwrap()
           }
           None => { (*srcs.get(srcs.len() - 2u)).clone() }
         };
@@ -1163,7 +1163,7 @@ fn disassemble_extract(config: &config, _props: &TestProps,
 
 fn count_extracted_lines(p: &Path) -> uint {
     let x = File::open(&p.with_extension("ll")).read_to_end().unwrap();
-    let x = str::from_utf8(x.as_slice()).unwrap();
+    let x = str::from_utf8_owned(x).unwrap();
     x.lines().len()
 }
 

branches/auto/src/doc/complement-cheatsheet.md

@@ -96,7 +96,7 @@ Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.htm
 use std::io::BufferedReader;
 # use std::io::MemReader;
 
-# let reader = MemReader::new(vec!());
+# let reader = MemReader::new(~[]);
 
 let mut reader = BufferedReader::new(reader);
 for line in reader.lines() {

branches/auto/src/etc/combine-tests.py

@@ -0,0 +1,91 @@
+# 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")

branches/auto/src/etc/kate/rust.xml

@@ -202,7 +202,7 @@
 			<RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
 			<RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/>
 			<Detect2Chars char="#" char1="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
-			<StringDetect String="#![" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
+			<Detect2Chars char="#" char1="!" char2="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
 			<RegExpr String="&rustIdent;::" attribute="Scope"/>
 			<RegExpr String="&rustIdent;!" attribute="Macro"/>
 			<RegExpr String="&apos;&rustIdent;(?!&apos;)" attribute="Lifetime"/>

branches/auto/src/etc/maketest.py

@@ -12,26 +12,20 @@
 import os
 import sys
 
-# 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]
+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]
 if ldpath != '':
     os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
 
 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()