Test fixes and rebase conflicts

src/test/run-make/test-shard-completeness/Makefile

@@ -1,7 +0,0 @@
--include ../tools.mk
-
-all:
-	# Running all the shards should hit every test
-	$(RUSTC) --test main.rs
-	$(call RUN,main) --test-shard 1.2 | grep "test_1 ... ok"
-	$(call RUN,main) --test-shard 2.2 | grep "test_2 ... ok"

src/test/run-make/test-shard-completeness/main.rs

@@ -1,16 +0,0 @@
-// 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.
-
-#![crate_type = "lib"]
-
-#[test]
-fn test_1() { }
-#[test]
-fn test_2() { }