---

yaml
---
r: 271551
b: refs/heads/auto
c: fd25a63
h: refs/heads/master
i:
  271549: 798239e
  271547: b804e2e
  271543: 40502d9
  271535: e71a512
  271519: 8ecce88
  271487: 199ea27

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ab0a87243e9bb97355cb0e4f53b2156cd68207fe
+refs/heads/auto: fd25a63ba9e2b81e40889e4e9ff3fe355e933cb5
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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/auto/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/auto/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;