---

yaml
---
r: 81283
b: refs/heads/snap-stage3
c: 1dbc467
h: refs/heads/master
i:
  81281: 04a5406
  81279: f0cc84b
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ab0a884a7373145222dfbadc8ec741f767cc45d1
+refs/heads/snap-stage3: 1dbc467fd957a0daf3fd935ccce0fc9ea5d1dcd8
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/tests.mk

@@ -261,6 +261,15 @@ tidy:
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_HS) \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src -type f -perm +111 \
+		    -not -name '*.rs' -and -not -name '*.py' \
+		    -and -not -name '*.sh' \
+		| grep '^$(S)src/llvm' -v \
+		| grep '^$(S)src/libuv' -v \
+		| grep '^$(S)src/gyp' -v \
+		| grep '^$(S)src/etc' -v \
+		| grep '^$(S)src/rt/jemalloc' -v \
+		| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
 
 endif
 

branches/snap-stage3/src/etc/check-binaries.py

@@ -0,0 +1,18 @@
+# Copyright 2013 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.
+
+import sys
+
+offenders = sys.argv[1:]
+if len(offenders) > 0:
+    print("Binaries checked into src:")
+    for offender in offenders:
+        print(offender)
+    sys.exit(1)

branches/snap-stage3/src/librustpkg/tests.rs

@@ -1812,9 +1812,11 @@ fn test_rustpkg_test_output() {
     let workspace = create_local_package_with_test(&PkgId::new("foo"));
     let output = command_line_test([~"test", ~"foo"], &workspace);
     let output_str = str::from_utf8(output.output);
-    assert!(output_str.contains("test f ... ok"));
-    assert!(output_str.contains(
-        "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured"));
+    // The first two assertions are separate because test output may
+    // contain color codes, which could appear between "test f" and "ok".
+    assert!(output_str.contains("test f"));
+    assert!(output_str.contains("ok"));
+    assert!(output_str.contains("1 passed; 0 failed; 0 ignored; 0 measured"));
 }
 
 #[test]

branches/snap-stage3/src/libsyntax/syntax

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // Make sure the destructor is run for unit-like structs.
-// xfail-fast
 
 use std::task;
 
@@ -21,7 +20,7 @@ impl Drop for Foo {
     }
 }
 
-fn main() {
+pub fn main() {
     let x = do task::try {
         let _b = Foo;
     };