jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ZackerySpytz-OCaml-copy_string-test'

Browse source 
* ZackerySpytz-OCaml-copy_string-test:
  [OCaml] Fix and re-enable the string_simple, minherit, and unions tests
This commit is contained in:
William S Fulton 2019-01-14 23:20:24 +00:00
commit 3fe9bbe907
7 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/ocaml/Makefile.in
View file

@ -35,7 +35,6 @@ director_using \
enum_thorough \
li_windows \
member_pointer_const \
minherit \
nested_directors \
preproc_constants \
smart_pointer_inherit \
@ -44,8 +43,6 @@ typedef_mptr \
FAILING_C_TESTS = \
enums \
preproc_constants_c \
string_simple \
unions \
ml_runme = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)

9
Examples/test-suite/ocaml/string_simple_runme.ml Normal file
View file

@ -0,0 +1,9 @@
open Swig
open String_simple
let str = "olé"
let copy = _copy_str (C_string str) as string
let _ = if str <> copy then
raise (Failure ("Error: copy is not equal: original="^str^", copy="^copy))

24
Examples/test-suite/ocaml/unions_runme.ml
View file

@ -8,21 +8,21 @@ let b = new_BigStruct C_void
let c = new_UnionTest C_void
let d = new_EmbeddedUnionTest C_void
let _ = (invoke a) "jill" (C_short 3)
let _ = (invoke b) "jack" (C_char 'a') (* Int conversion *)
let _ = (invoke b) "smallstruct" a (* Put a in b *)
let _ = (invoke c) "bs" b
let _ = (invoke a) "[jill]" (C_short 3)
let _ = (invoke b) "[jack]" (C_char 'a') (* Int conversion *)
let _ = (invoke b) "[smallstruct]" a (* Put a in b *)
let _ = (invoke c) "[bs]" b
let _ = if get_int ((invoke a) "jill" C_void) != 3 then
let _ = if get_int ((invoke a) "[jill]" C_void) != 3 then
raise (Failure "jill value is not preserved")
let _ = if get_int ((invoke b) "jack" C_void) != (int_of_char 'a') then
let _ = if get_int ((invoke b) "[jack]" C_void) != (int_of_char 'a') then
raise (Failure "jack value is not preserved")
let _ = if get_int ((invoke ((invoke b) "smallstruct" C_void))
"jill" C_void) != 3 then
let _ = if get_int ((invoke ((invoke b) "[smallstruct]" C_void))
"[jill]" C_void) != 3 then
raise (Failure "jill value is not embedded in bigstruct")
let _ = if get_int ((invoke ((invoke c) "bs" C_void))
"jack" C_void) != (int_of_char 'a') then
let _ = if get_int ((invoke ((invoke c) "[bs]" C_void))
"[jack]" C_void) != (int_of_char 'a') then
raise (Failure "union set of bigstruct did not take")
let _ = if get_int ((invoke ((invoke c) "ss" C_void))
"jill" C_void) != (int_of_char 'a') then
let _ = if get_int ((invoke ((invoke c) "[ss]" C_void))
"[jill]" C_void) != (int_of_char 'a') then
raise (Failure "corresponding union values are not the same")