From 466fe4559d202ebb3892afcf0fd26998a89375cd Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 10 Nov 2014 10:30:35 -0800 Subject: [PATCH] ffi_test: Can actually test 62 and 63 on windows. --- basis/compiler/tests/alien.factor | 31 ++++++++++++++++--------------- vm/ffi_test.c | 3 ++- vm/ffi_test.h | 3 ++- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor index 2213dd1c34..d44968db3e 100755 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -896,24 +896,25 @@ os windows? [ S{ bool-and-ptr { b t } { ptr f } } } [ ffi_test_61 ] unit-test - STRUCT: uint-pair - { a uint } - { b uint } ; +] unless - FUNCTION: uint-pair ffi_test_62 ( ) ; +STRUCT: uint-pair + { a uint } + { b uint } ; - { - S{ uint-pair { a 0xabcdefab } { b 0x12345678 } } - } [ ffi_test_62 ] unit-test +FUNCTION: uint-pair ffi_test_62 ( ) ; - STRUCT: ulonglong-pair - { a ulonglong } - { b ulonglong } ; +{ + S{ uint-pair { a 0xabcdefab } { b 0x12345678 } } +} [ ffi_test_62 ] unit-test - FUNCTION: ulonglong-pair ffi_test_63 ( ) ; +STRUCT: ulonglong-pair + { a ulonglong } + { b ulonglong } ; - { - S{ ulonglong-pair { a 0xabcdefabcdefabcd } { b 0x1234567891234567 } } - } [ ffi_test_63 ] unit-test +FUNCTION: ulonglong-pair ffi_test_63 ( ) ; + +{ + S{ ulonglong-pair { a 0xabcdefabcdefabcd } { b 0x1234567891234567 } } +} [ ffi_test_63 ] unit-test -] unless \ No newline at end of file diff --git a/vm/ffi_test.c b/vm/ffi_test.c index 06ce2b2af7..2bef4a5465 100644 --- a/vm/ffi_test.c +++ b/vm/ffi_test.c @@ -317,6 +317,8 @@ struct bool_and_ptr ffi_test_61() { return bap; } +#endif + struct uint_pair ffi_test_62() { struct uint_pair uip; uip.a = 0xabcdefab; @@ -331,4 +333,3 @@ struct ulonglong_pair ffi_test_63() { return ullp; } -#endif diff --git a/vm/ffi_test.h b/vm/ffi_test.h index 8326097a8a..e813ec990d 100644 --- a/vm/ffi_test.h +++ b/vm/ffi_test.h @@ -215,6 +215,8 @@ struct bool_and_ptr { FACTOR_EXPORT struct bool_and_ptr ffi_test_61(); +#endif + struct uint_pair { unsigned int a; unsigned int b; @@ -229,4 +231,3 @@ struct ulonglong_pair { FACTOR_EXPORT struct ulonglong_pair ffi_test_63(); -#endif