summaryrefslogtreecommitdiff
path: root/test/Bindings
diff options
context:
space:
mode:
authorPeter Zotov <whitequark@whitequark.org>2013-11-15 03:19:08 +0000
committerPeter Zotov <whitequark@whitequark.org>2013-11-15 03:19:08 +0000
commitb53c129da1f5552a5918adba3839de4da6d5ca5d (patch)
tree654255f6ecf9b79000a46b06c629d52315de1581 /test/Bindings
parentb6703ff81b4739be67ae7b07f1bfcfb6f157f891 (diff)
downloadllvm-b53c129da1f5552a5918adba3839de4da6d5ca5d.tar.gz
llvm-b53c129da1f5552a5918adba3839de4da6d5ca5d.tar.bz2
llvm-b53c129da1f5552a5918adba3839de4da6d5ca5d.tar.xz
[OCaml] Use native target in testsuite instead of hardcoding X86
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194778 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Bindings')
-rw-r--r--test/Bindings/Ocaml/lit.local.cfg1
-rw-r--r--test/Bindings/Ocaml/target.ml26
2 files changed, 11 insertions, 16 deletions
diff --git a/test/Bindings/Ocaml/lit.local.cfg b/test/Bindings/Ocaml/lit.local.cfg
index ac9f3717b3..c38d89ab09 100644
--- a/test/Bindings/Ocaml/lit.local.cfg
+++ b/test/Bindings/Ocaml/lit.local.cfg
@@ -3,4 +3,3 @@ config.suffixes = ['.ml']
bindings = set([s.strip() for s in config.root.llvm_bindings.split(',')])
if not 'ocaml' in bindings:
config.unsupported = True
-
diff --git a/test/Bindings/Ocaml/target.ml b/test/Bindings/Ocaml/target.ml
index 990714c2cb..aee99edcba 100644
--- a/test/Bindings/Ocaml/target.ml
+++ b/test/Bindings/Ocaml/target.ml
@@ -1,7 +1,7 @@
(* RUN: rm -rf %t.builddir
* RUN: mkdir -p %t.builddir
* RUN: cp %s %t.builddir
- * RUN: %ocamlopt -g -warn-error A llvm.cmxa llvm_target.cmxa llvm_X86.cmxa %t.builddir/target.ml -o %t
+ * RUN: %ocamlopt -g -warn-error A llvm.cmxa llvm_target.cmxa llvm_executionengine.cmxa %t.builddir/target.ml -o %t
* RUN: %t %t.bc
* XFAIL: vg_leak
*)
@@ -13,7 +13,7 @@
open Llvm
open Llvm_target
-let _ = Llvm_X86.initialize ()
+let _ = Llvm_executionengine.initialize_native_target ()
let context = global_context ()
let i32_type = Llvm.i32_type context
@@ -34,13 +34,9 @@ let assert_equal a b =
let filename = Sys.argv.(1)
let m = create_module context filename
-let target =
- match Target.by_name "x86" with
- | Some t -> t
- | None -> failwith "need a target"
+let target = Target.by_triple (Target.default_triple ())
-let machine =
- TargetMachine.create ~triple:"i686-linux-gnu" ~cpu:"core2" target
+let machine = TargetMachine.create (Target.default_triple ()) target
(*===-- Data Layout -------------------------------------------------------===*)
@@ -76,11 +72,11 @@ let test_target_data () =
let test_target () =
let module T = Target in
ignore (T.succ target);
- assert_equal (T.name target) "x86";
- assert_equal (T.description target) "32-bit X86: Pentium-Pro and above";
- assert_equal (T.has_jit target) true;
- assert_equal (T.has_target_machine target) true;
- assert_equal (T.has_asm_backend target) true
+ ignore (T.name target);
+ ignore (T.description target);
+ ignore (T.has_jit target);
+ ignore (T.has_target_machine target);
+ ignore (T.has_asm_backend target)
(*===-- Target Machine ----------------------------------------------------===*)
@@ -88,8 +84,8 @@ let test_target () =
let test_target_machine () =
let module TM = TargetMachine in
assert_equal (TM.target machine) target;
- assert_equal (TM.triple machine) "i686-linux-gnu";
- assert_equal (TM.cpu machine) "core2";
+ assert_equal (TM.triple machine) (Target.default_triple ());
+ assert_equal (TM.cpu machine) "";
assert_equal (TM.features machine) "";
ignore (TM.data_layout machine)