about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-03-25 19:33:13 -0400
committerNiko Matsakis <niko@alum.mit.edu>2016-03-25 19:33:13 -0400
commit1ea93c2a6388b7dcddf1ae89105a9f6f2e1da9f1 (patch)
treeefcb06630bb684c239da3a301c12ff91d890831a
parent874574d5487d5efdf7401c3e9f318921d6dfd369 (diff)
downloadrust-1ea93c2a6388b7dcddf1ae89105a9f6f2e1da9f1.tar.gz
rust-1ea93c2a6388b7dcddf1ae89105a9f6f2e1da9f1.zip
remove link-guard test
-rw-r--r--src/test/run-make/link-guard/Makefile13
-rw-r--r--src/test/run-make/link-guard/bad/lib.rs16
-rw-r--r--src/test/run-make/link-guard/good/lib.rs16
-rw-r--r--src/test/run-make/link-guard/main.rs15
4 files changed, 0 insertions, 60 deletions
diff --git a/src/test/run-make/link-guard/Makefile b/src/test/run-make/link-guard/Makefile
deleted file mode 100644
index 38970652cb5..00000000000
--- a/src/test/run-make/link-guard/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
--include ../tools.mk
-
-all:
-	-mkdir -p $(TMPDIR)/good
-	-mkdir -p $(TMPDIR)/bad
-	$(BARE_RUSTC) ./good/lib.rs -C prefer-dynamic --out-dir="$(TMPDIR)/good"
-	$(BARE_RUSTC) ./bad/lib.rs -C prefer-dynamic --out-dir="$(TMPDIR)/bad"
-	$(BARE_RUSTC) -L "$(TMPDIR)/good" -C prefer-dynamic -Crpath ./main.rs --out-dir="$(TMPDIR)"
-	# This should succeed because the correct library is in LD_LIBRARY_PATH
-	$(LD_LIB_PATH_ENVVAR)="$(TMPDIR)/good:$($(LD_LIB_PATH_ENVVAR))" $(TMPDIR)/main
-	# This should fail because the wrong library is in LD_LIBRARY_PATH
-	OUTPUT=`$(LD_LIB_PATH_ENVVAR)="$(TMPDIR)/bad:$($(LD_LIB_PATH_ENVVAR))" $(TMPDIR)/main || exit 0`
-	if ["$(OUTPUT)" == "bad"]; then exit 1; fi
diff --git a/src/test/run-make/link-guard/bad/lib.rs b/src/test/run-make/link-guard/bad/lib.rs
deleted file mode 100644
index c13c0d5e92f..00000000000
--- a/src/test/run-make/link-guard/bad/lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 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="thelibrary"]
-#![crate_type="dylib"]
-
-pub fn some_library_function() {
-    println!("bad");
-}
diff --git a/src/test/run-make/link-guard/good/lib.rs b/src/test/run-make/link-guard/good/lib.rs
deleted file mode 100644
index c13c0d5e92f..00000000000
--- a/src/test/run-make/link-guard/good/lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 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="thelibrary"]
-#![crate_type="dylib"]
-
-pub fn some_library_function() {
-    println!("bad");
-}
diff --git a/src/test/run-make/link-guard/main.rs b/src/test/run-make/link-guard/main.rs
deleted file mode 100644
index c422316d918..00000000000
--- a/src/test/run-make/link-guard/main.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 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.
-
-extern crate thelibrary;
-
-fn main() {
-    thelibrary::some_library_function();
-}