objc4-818.2.tar.gz

[apple/objc4.git] / test / isaValidation.m

diff --git a/test/isaValidation.m b/test/isaValidation.m
index 3a00a47c855d9c5dae88b404ea7d2961c39622e4..4d70b88118e9c913a697d279de5a7651851cf3ca 100644 (file)
--- a/test/isaValidation.m
+++ b/test/isaValidation.m
@@ -60,12 +60,8 @@ objc\[\d+\]: Attempt to use unknown class 0x[0-9a-f]+.
 objc\[\d+\]: HALTED
 Testing class_setIvarLayout
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'TestRoot'
 objc\[\d+\]: HALTED
 Testing class_setIvarLayout
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'TestRoot'

-objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'TestRoot'
-objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'NSObject'

 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'NSObject'
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'AllocatedTestClass2'
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'NSObject'
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'AllocatedTestClass2'

-objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'AllocatedTestClass2'
-objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'TestRoot'

 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'DuplicateClass'
 Completed test on good classes.
 objc\[\d+\]: Attempt to use unknown class 0x[0-9a-f]+.
 objc\[\d+\]: \*\*\* Can't set ivar layout for already-registered class 'DuplicateClass'
 Completed test on good classes.
 objc\[\d+\]: Attempt to use unknown class 0x[0-9a-f]+.


@@ -114,7 +110,7 @@ END
 
 extern char **environ;
 
 
 extern char **environ;
 

-id dummyIMP(id self, SEL _cmd, ...) { (void)_cmd; return self; }
+id dummyIMP(id self, SEL _cmd) { (void)_cmd; return self; }

 
 char *dupeName(Class cls) {
     char *name;
 
 char *dupeName(Class cls) {
     char *name;


@@ -150,13 +146,13 @@ struct TestCase TestCases[] = {
     TESTCASE(free(class_copyProtocolList(cls, NULL))),
     TESTCASE(class_getProperty(cls, "x")),
     TESTCASE(free(class_copyPropertyList(cls, NULL))),
     TESTCASE(free(class_copyProtocolList(cls, NULL))),
     TESTCASE(class_getProperty(cls, "x")),
     TESTCASE(free(class_copyPropertyList(cls, NULL))),

-    TESTCASE(class_addMethod(cls, @selector(nop), dummyIMP, "v@:")),
-    TESTCASE(class_replaceMethod(cls, @selector(nop), dummyIMP, "v@:")),
+    TESTCASE(class_addMethod(cls, @selector(nop), (IMP)dummyIMP, "v@:")),
+    TESTCASE(class_replaceMethod(cls, @selector(nop), (IMP)dummyIMP, "v@:")),

     TESTCASE(class_addIvar(cls, "x", sizeof(int), sizeof(int), @encode(int))),
     TESTCASE(class_addProtocol(cls, @protocol(P))),
     TESTCASE(class_addProperty(cls, "x", NULL, 0)),
     TESTCASE(class_replaceProperty(cls, "x", NULL, 0)),
     TESTCASE(class_addIvar(cls, "x", sizeof(int), sizeof(int), @encode(int))),
     TESTCASE(class_addProtocol(cls, @protocol(P))),
     TESTCASE(class_addProperty(cls, "x", NULL, 0)),
     TESTCASE(class_replaceProperty(cls, "x", NULL, 0)),

-    TESTCASE(class_setIvarLayout(cls, NULL)),
+    TESTCASE_NOMETA(class_setIvarLayout(cls, NULL)),

     TESTCASE(class_setWeakIvarLayout(cls, NULL)),
     TESTCASE_NOMETA(objc_registerClassPair(cls)),
     TESTCASE_NOMETA(objc_duplicateClass(cls, dupeName(cls), 0)),
     TESTCASE(class_setWeakIvarLayout(cls, NULL)),
     TESTCASE_NOMETA(objc_registerClassPair(cls)),
     TESTCASE_NOMETA(objc_duplicateClass(cls, dupeName(cls), 0)),