about summary refs log tree commit diff
diff options
context:
space:
mode:
authorklutzy <klutzytheklutzy@gmail.com>2014-04-25 13:57:54 +0900
committerklutzy <klutzytheklutzy@gmail.com>2014-04-25 17:07:56 +0900
commit0f52122fa23a3b0e853bc8b4ebe29d6102201274 (patch)
treed9e08bdcf46321945dd1f8b03aa59274e1bc5b39
parent66486518d5e1e4f0850024386b66a7aa790fc32f (diff)
downloadrust-0f52122fa23a3b0e853bc8b4ebe29d6102201274.tar.gz
rust-0f52122fa23a3b0e853bc8b4ebe29d6102201274.zip
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.
-rw-r--r--src/test/run-make/extern-fn-reachable/Makefile6
-rw-r--r--src/test/run-make/extern-fn-reachable/dylib.rs24
-rw-r--r--src/test/run-make/extern-fn-reachable/main.rs (renamed from src/test/run-pass/extern-fn-reachable.rs)23
3 files changed, 34 insertions, 19 deletions
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 00000000000..0560626c999
--- /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 00000000000..f24265e7a52
--- /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 <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_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
index 615013888bd..e05d43145d7 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::<int>("fun1").is_ok());
         assert!(a.symbol::<int>("fun2").is_err());
         assert!(a.symbol::<int>("fun3").is_err());
         assert!(a.symbol::<int>("fun4").is_ok());
-        assert!(a.symbol::<int>("fun5").is_err());
+        assert!(a.symbol::<int>("fun5").is_ok());
     }
 }