From bccd43c59772d00e36c6d605125ce28239eb7f43 Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 24 Feb 2011 18:53:31 +0000 Subject: [PATCH] Fixup bad function calls. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32356 72102866-910b-0410-8b05-ffd578937521 --- Tests/base/GSXML/basic.m | 4 +++- Tests/base/NSBlock/blockassign.m | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Tests/base/GSXML/basic.m b/Tests/base/GSXML/basic.m index 2f2b85e0f..359caa530 100644 --- a/Tests/base/GSXML/basic.m +++ b/Tests/base/GSXML/basic.m @@ -151,7 +151,9 @@ int main() #else int main(int argc,char **argv) { - unsupported("GSXML support unavailable"); + START_SET("GSXML") + SKIP("GSXML support unavailable"); + END_SET("GSXML") return 0; } #endif diff --git a/Tests/base/NSBlock/blockassign.m b/Tests/base/NSBlock/blockassign.m index cdf538b81..13fd1d485 100644 --- a/Tests/base/NSBlock/blockassign.m +++ b/Tests/base/NSBlock/blockassign.m @@ -3,25 +3,25 @@ int main (int argc, char **argv) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + START_SET("NSBlock") #if __has_feature(blocks) - BOOL (^hello)(void) = ^() { return YES; }; - PASS(hello(), "Calling a block"); - BOOL (^helloCopy)(void) = Block_copy(hello); - Block_release(hello); - PASS(helloCopy(), "Calling a copy of a block"); - NSArray *blockArr = [NSArray arrayWithObject:helloCopy]; - PASS([blockArr count] == 1, "Block used as object in an array"); - void (^helloArr)(void) = [blockArr objectAtIndex:0]; - PASS(helloCopy(), "Block successfully retrived from array"); - Block_release(helloCopy); + BOOL (^hello)(void) = ^() { return YES; }; + PASS(hello(), "Calling a block"); + BOOL (^helloCopy)(void) = Block_copy(hello); + Block_release(hello); + PASS(helloCopy(), "Calling a copy of a block"); + NSArray *blockArr = [NSArray arrayWithObject:helloCopy]; + PASS([blockArr count] == 1, "Block used as object in an array"); + void (^helloArr)(void) = [blockArr objectAtIndex:0]; + PASS(helloCopy(), "Block successfully retrived from array"); + Block_release(helloCopy); #elif defined(__clang__) - unsupported("Your compiler supports blocks, but this support was disabled for some reason."); + SKIP("Your compiler supports blocks, but this support was disabled for some reason.") #else - unsupported("Your compiler does not support blocks."); + SKIP("Your compiler does not support blocks.") #endif - [pool drain]; + END_SET("NSBlock") - return 0; + return 0; }