---

yaml
---
r: 126461
b: refs/heads/auto
c: 08f033b
h: refs/heads/master
i:
  126459: e867f21
v: v3

Author: jfager

[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: e5df5f56069de2778857597118a6e5f95d659736
+refs/heads/auto: 08f033b8b73a00180955096f2c03df187f9b2060
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/.gitignore

@@ -1,94 +1,90 @@
-*.a
-*.aux
-*.bc
+*~
+\#*\#
+\#*
+.#*
+*.x86
+*.llvm
+*.out
 *.boot
-*.bz2
-*.cmi
-*.cmo
+*.rustc
 *.cmx
-*.cp
-*.cps
-*.d
-*.dSYM
-*.def
-*.diff
 *.dll
-*.dylib
-*.elc
-*.epub
+*.def
 *.exe
+*.a
+*.rlib
+*.so
+*.dylib
+*.orig
+*.cmo
+*.cmi
+*.dSYM
+*.d
+*.o
+*.ll
+*.bc
+*.aux
+*.cp
 *.fn
-*.html
 *.ky
-*.ll
-*.llvm
+*.cps
 *.log
-*.o
-*.orig
-*.out
-*.patch
 *.pdf
+*.epub
+*.html
 *.pg
-*.pot
-*.pyc
-*.rej
-*.rlib
-*.rustc
-*.so
-*.swo
-*.swp
-*.tmp
 *.toc
 *.tp
 *.vr
-*.x86
-*~
-.#*
-.DS_Store
-.cproject
+*.patch
+*.diff
+*.rej
+*.swp
+*.swo
+*.tmp
+*.pyc
+*.elc
 .hg/
 .hgignore
+.cproject
 .project
-.settings/
 .valgrindrc
-/*-*-*-*/
-/*-*-*/
+lexer.ml
+TAGS
+TAGS.emacs
+TAGS.vi
+version.ml
+version.texi
 /Makefile
-/build
-/dist/
-/dl/
-/doc
-/inst/
-/llvm/
-/mingw-build/
-/nd/
+config.mk
 /rt/
 /rustllvm/
-/src/libunicode/DerivedCoreProperties.txt
-/src/libunicode/EastAsianWidth.txt
-/src/libunicode/HangulSyllableType.txt
-/src/libunicode/PropList.txt
-/src/libunicode/Scripts.txt
-/src/libunicode/UnicodeData.txt
+/test/
+/inst/
+/mingw-build/
+src/.DS_Store
+/tmp/
+/dist/
 /stage0/
+/dl/
 /stage1/
 /stage2/
 /stage3/
-/test/
-/tmp/
-TAGS
-TAGS.emacs
-TAGS.vi
-\#*
-\#*\#
-config.mk
-config.stamp
+*.bz2
+/doc
+/nd/
+/llvm/
+version.md
 keywords.md
-lexer.ml
-src/.DS_Store
+x86_64-apple-darwin/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
+tmp.*.rs
+config.stamp
+.DS_Store
 src/etc/dl
+.settings/
+/build
+i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-tmp.*.rs
-version.md
-version.ml
-version.texi
+*.pot

branches/auto/configure

@@ -291,10 +291,6 @@ case $CFG_OSTYPE in
         CFG_OSTYPE=unknown-freebsd
         ;;
 
-    DragonFly)
-        CFG_OSTYPE=unknown-dragonfly
-        ;;
-
     Darwin)
         CFG_OSTYPE=apple-darwin
         ;;

branches/auto/mk/crates.mk

@@ -51,7 +51,7 @@
 
 TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
-                 url log regex graphviz core rbml rlibc alloc debug rustrt \
+                 url log regex graphviz core rlibc alloc debug rustrt \
                  unicode
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros \
 	       rustc_llvm rustc_back
@@ -71,7 +71,7 @@ DEPS_green := std native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
 DEPS_syntax := std term serialize log fmt_macros debug
-DEPS_rustc := syntax flate arena serialize getopts rbml \
+DEPS_rustc := syntax flate arena serialize getopts \
               time log graphviz debug rustc_llvm rustc_back
 DEPS_rustc_llvm := native:rustllvm libc std
 DEPS_rustc_back := std syntax rustc_llvm flate log libc
@@ -82,7 +82,6 @@ DEPS_arena := std
 DEPS_graphviz := std
 DEPS_glob := std
 DEPS_serialize := std log
-DEPS_rbml := std log serialize
 DEPS_term := std log
 DEPS_semver := std
 DEPS_uuid := std serialize
@@ -92,7 +91,7 @@ DEPS_collections := core alloc unicode
 DEPS_fourcc := rustc syntax std
 DEPS_hexfloat := rustc syntax std
 DEPS_num := std
-DEPS_test := std getopts serialize rbml term time regex native:rust_test_helpers
+DEPS_test := std getopts serialize term time regex native:rust_test_helpers
 DEPS_time := std serialize
 DEPS_rand := core
 DEPS_url := std

branches/auto/mk/docs.mk

@@ -285,7 +285,7 @@ doc/$(1)/:
 $(2) += doc/$(1)/index.html
 doc/$(1)/index.html: CFG_COMPILER_HOST_TRIPLE = $(CFG_TARGET)
 doc/$(1)/index.html: $$(LIB_DOC_DEP_$(1)) doc/$(1)/
-	@$$(call E, rustdoc: $$@)
+	@$$(call E, rustdoc $$@)
 	$$(Q)$$(RUSTDOC) --cfg dox --cfg stage2 $$<
 endef
 

branches/auto/mk/grammar.mk

@@ -13,7 +13,7 @@ SG = $(S)src/grammar/
 B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
 L = $(B)lib/rustlib/$(CFG_BUILD)/lib
 LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
-RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
+RUSTC = $(B)bin/rustc
 
 # Run the reference lexer against libsyntax and compare the tokens and spans.
 # If "// ignore-lexer-test" is present in the file, it will be ignored.
@@ -37,25 +37,19 @@ $(BG)RustLexer.class: $(SG)RustLexer.g4
 $(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
 	$(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs
 
+check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
 ifdef CFG_JAVAC
 ifdef CFG_ANTLR4
 ifdef CFG_GRUN
-check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
 	$(info Verifying libsyntax against the reference lexer ...)
 	$(Q)$(SG)check.sh $(S) "$(BG)" \
 		"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
 else
-$(info cfg: grun not available, skipping lexer test...)
-check-lexer:
-
+$(info grun not available, skipping lexer test...)
 endif
 else
-$(info cfg: antlr4 not available, skipping lexer test...)
-check-lexer:
-
+$(info antlr4 not available, skipping lexer test...)
 endif
 else
-$(info cfg: javac not available, skipping lexer test...)
-check-lexer:
-
+$(info javac not available, skipping lexer test...)
 endif

branches/auto/mk/platform.mk

@@ -580,33 +580,6 @@ CFG_LDPATH_x86_64-unknown-freebsd :=
 CFG_RUN_x86_64-unknown-freebsd=$(2)
 CFG_RUN_TARG_x86_64-unknown-freebsd=$(call CFG_RUN_x86_64-unknown-freebsd,,$(2))
 
-# x86_64-pc-dragonfly-elf configuration
-CC_x86_64-unknown-dragonfly=$(CC)
-CXX_x86_64-unknown-dragonfly=$(CXX)
-CPP_x86_64-unknown-dragonfly=$(CPP)
-AR_x86_64-unknown-dragonfly=$(AR)
-CFG_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).so
-CFG_STATIC_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).a
-CFG_LIB_GLOB_x86_64-unknown-dragonfly=lib$(1)-*.so
-CFG_LIB_DSYM_GLOB_x86_64-unknown-dragonfly=$(1)-*.dylib.dSYM
-CFG_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS)
-CFG_GCCISH_CFLAGS_x86_64-unknown-dragonfly := -Wall -Werror -g -fPIC -I/usr/include -I/usr/local/include $(CFLAGS)
-CFG_GCCISH_LINK_FLAGS_x86_64-unknown-dragonfly := -shared -fPIC -g -pthread  -lrt
-CFG_GCCISH_DEF_FLAG_x86_64-unknown-dragonfly := -Wl,--export-dynamic,--dynamic-list=
-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-whole-archive
-CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-no-whole-archive
-CFG_DEF_SUFFIX_x86_64-unknown-dragonfly := .bsd.def
-CFG_LLC_FLAGS_x86_64-unknown-dragonfly :=
-CFG_INSTALL_NAME_x86_64-unknown-dragonfly =
-CFG_LIBUV_LINK_FLAGS_x86_64-unknown-dragonfly := -pthread  -lkvm
-CFG_EXE_SUFFIX_x86_64-unknown-dragonfly :=
-CFG_WINDOWSY_x86_64-unknown-dragonfly :=
-CFG_UNIXY_x86_64-unknown-dragonfly := 1
-CFG_PATH_MUNGE_x86_64-unknown-dragonfly :=
-CFG_LDPATH_x86_64-unknown-dragonfly :=
-CFG_RUN_x86_64-unknown-dragonfly=$(2)
-CFG_RUN_TARG_x86_64-unknown-dragonfly=$(call CFG_RUN_x86_64-unknown-dragonfly,,$(2))
-
 
 # The -Qunused-arguments sidesteps spurious warnings from clang
 define FILTER_FLAGS

branches/auto/mk/rt.mk

@@ -171,10 +171,6 @@ else ifeq ($(OSTYPE_$(1)), apple-ios)
   JEMALLOC_ARGS_$(1) := --disable-tls
 else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
   LIBUV_OSTYPE_$(1) := freebsd
-else ifeq ($(OSTYPE_$(1)), unknown-dragonfly)
-  LIBUV_OSTYPE_$(1) := freebsd
-  # required on DragonFly, otherwise gyp fails with a Python exception
-  LIBUV_GYP_ARGS_$(1) := --no-parallel
 else ifeq ($(OSTYPE_$(1)), linux-androideabi)
   LIBUV_OSTYPE_$(1) := android
   LIBUV_ARGS_$(1) := PLATFORM=android host=android OS=linux
@@ -206,7 +202,7 @@ $$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1))
 	 $$(CFG_PYTHON) ./gyp_uv.py -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) \
 	   -D ninja \
 	   -DOS=$$(LIBUV_OSTYPE_$(1)) \
-	   -Goutput_dir=$$(@D) $$(LIBUV_GYP_ARGS_$(1)) --generator-output $$(@D))
+	   -Goutput_dir=$$(@D) --generator-output $$(@D))
 	touch $$@
 
 # Windows has a completely different build system for libuv because of mingw. In

branches/auto/mk/tests.mk

@@ -171,41 +171,28 @@ endif
 # Main test targets
 ######################################################################
 
-# The main testing target. Tests lots of stuff.
 check: cleantmptestlogs cleantestlibs check-notidy tidy
 
-# As above but don't bother running tidy.
 check-notidy: cleantmptestlogs cleantestlibs all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# A slightly smaller set of tests for smoke testing.
 check-lite: cleantestlibs cleantmptestlogs \
 	$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
 	check-stage2-rpass \
 	check-stage2-rfail check-stage2-cfail 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-rfail check-stage2-cfail check-stage2-rmake
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# Only check the docs.
 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
 
-# Some less critical tests that are not prone to breakage.
-# Not run as part of the normal test suite, but tested by bors on checkin.
-check-secondary: check-lexer check-pretty
-
-# check + check-secondary.
-check-all: check check-secondary
-
-# Pretty-printing tests.
-check-pretty: check-stage2-T-$(CFG_BUILD)-H-$(CFG_BUILD)-pretty-exec
+check-syntax: check-lexer
 
 .PHONY: cleantmptestlogs cleantestlibs
 

branches/auto/src/compiletest/common.rs

@@ -136,7 +136,7 @@ pub struct Config {
     // Extra parameter to run adb on arm-linux-androideabi
     pub adb_path: String,
 
-    // Extra parameter to run test suite on arm-linux-androideabi
+    // Extra parameter to run test sute on arm-linux-androideabi
     pub adb_test_dir: String,
 
     // status whether android device available or not