---

yaml
---
r: 276508
b: refs/heads/try
c: fd25a63
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: ab0a87243e9bb97355cb0e4f53b2156cd68207fe
+refs/heads/try: fd25a63ba9e2b81e40889e4e9ff3fe355e933cb5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/test/run-make/a-b-a-linker-guard/Makefile

@@ -1,7 +1,12 @@
 -include ../tools.mk
 
+# Test that if we build `b` against a version of `a` that has one set
+# of types, it will not run with a dylib that has a different set of
+# types.
+
 all:
 	$(RUSTC) a.rs --cfg x -C prefer-dynamic
 	$(RUSTC) b.rs -C prefer-dynamic
+	$(call RUN,b)
 	$(RUSTC) a.rs --cfg y -C prefer-dynamic
-	$(call RUN,b) 2>&1 | grep "undefined symbol"
+	$(call FAIL,b)

branches/try/src/test/run-make/a-b-a-linker-guard/a.rs

@@ -1,3 +1,13 @@
+// Copyright 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.
+
 #![crate_name = "a"]
 #![crate_type = "dylib"]
 

branches/try/src/test/run-make/a-b-a-linker-guard/b.rs

@@ -1,3 +1,13 @@
+// Copyright 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.
+
 #![crate_name = "b"]
 
 extern crate a;