From 1ea93c2a6388b7dcddf1ae89105a9f6f2e1da9f1 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 25 Mar 2016 19:33:13 -0400 Subject: [PATCH] remove link-guard test --- src/test/run-make/link-guard/Makefile | 13 ------------- src/test/run-make/link-guard/bad/lib.rs | 16 ---------------- src/test/run-make/link-guard/good/lib.rs | 16 ---------------- src/test/run-make/link-guard/main.rs | 15 --------------- 4 files changed, 60 deletions(-) delete mode 100644 src/test/run-make/link-guard/Makefile delete mode 100644 src/test/run-make/link-guard/bad/lib.rs delete mode 100644 src/test/run-make/link-guard/good/lib.rs delete mode 100644 src/test/run-make/link-guard/main.rs 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 or the MIT license -// , 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 or the MIT license -// , 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 or the MIT license -// , 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(); -} -- 2.44.0