From 0f52122fa23a3b0e853bc8b4ebe29d6102201274 Mon Sep 17 00:00:00 2001 From: klutzy Date: Fri, 25 Apr 2014 13:57:54 +0900 Subject: [PATCH] test: Enable extern-fn-reachable test It didn't work because it tried to call itself but symbols are not exported as default in executables. Note that `fun5` is not internal anymore since it is in library. --- .../run-make/extern-fn-reachable/Makefile | 6 +++++ .../run-make/extern-fn-reachable/dylib.rs | 24 +++++++++++++++++++ .../extern-fn-reachable/main.rs} | 23 ++++-------------- 3 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 src/test/run-make/extern-fn-reachable/Makefile create mode 100644 src/test/run-make/extern-fn-reachable/dylib.rs rename src/test/{run-pass/extern-fn-reachable.rs => run-make/extern-fn-reachable/main.rs} (55%) diff --git a/src/test/run-make/extern-fn-reachable/Makefile b/src/test/run-make/extern-fn-reachable/Makefile new file mode 100644 index 000000000000..0560626c9994 --- /dev/null +++ b/src/test/run-make/extern-fn-reachable/Makefile @@ -0,0 +1,6 @@ +-include ../tools.mk + +all: + $(RUSTC) dylib.rs -o $(TMPDIR)/libdylib.so + $(RUSTC) main.rs + $(call RUN,main) diff --git a/src/test/run-make/extern-fn-reachable/dylib.rs b/src/test/run-make/extern-fn-reachable/dylib.rs new file mode 100644 index 000000000000..f24265e7a522 --- /dev/null +++ b/src/test/run-make/extern-fn-reachable/dylib.rs @@ -0,0 +1,24 @@ +// Copyright 2013-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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_type = "dylib"] +#![allow(dead_code)] + +#[no_mangle] pub extern "C" fn fun1() {} +#[no_mangle] extern "C" fn fun2() {} + +mod foo { + #[no_mangle] pub extern "C" fn fun3() {} +} +pub mod bar { + #[no_mangle] pub extern "C" fn fun4() {} +} + +#[no_mangle] pub fn fun5() {} diff --git a/src/test/run-pass/extern-fn-reachable.rs b/src/test/run-make/extern-fn-reachable/main.rs similarity index 55% rename from src/test/run-pass/extern-fn-reachable.rs rename to src/test/run-make/extern-fn-reachable/main.rs index 615013888bd1..e05d43145d7e 100644 --- a/src/test/run-pass/extern-fn-reachable.rs +++ b/src/test/run-make/extern-fn-reachable/main.rs @@ -8,32 +8,17 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 dynamic_lib can read dllexported symbols only -// ignore-linux apparently dlsym doesn't work on program symbols? -// ignore-android apparently dlsym doesn't work on program symbols? -// ignore-freebsd apparently dlsym doesn't work on program symbols? - use std::unstable::dynamic_lib::DynamicLibrary; - -#[no_mangle] pub extern "C" fn fun1() {} -#[no_mangle] extern "C" fn fun2() {} - -mod foo { - #[no_mangle] pub extern "C" fn fun3() {} -} -pub mod bar { - #[no_mangle] pub extern "C" fn fun4() {} -} - -#[no_mangle] pub fn fun5() {} +use std::os; pub fn main() { unsafe { - let a = DynamicLibrary::open(None).unwrap(); + let path = Path::new("libdylib.so"); + let a = DynamicLibrary::open(Some(&path)).unwrap(); assert!(a.symbol::("fun1").is_ok()); assert!(a.symbol::("fun2").is_err()); assert!(a.symbol::("fun3").is_err()); assert!(a.symbol::("fun4").is_ok()); - assert!(a.symbol::("fun5").is_err()); + assert!(a.symbol::("fun5").is_ok()); } }