summaryrefslogtreecommitdiff
path: root/objective-c/test
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-05-06 10:37:22 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-05-06 10:37:22 -0230
commit5571b3d1849bde9c3e54724e15a5fa8c5370f178 (patch)
treef95bb214bc4d8c69b426c943062a67b0f2ab09e7 /objective-c/test
parentFixed ICE-6482: Cleanup WinRT makefiles, other WinRT minor fixes (diff)
downloadice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.tar.bz2
ice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.tar.xz
ice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.zip
Only add csharp to all-cross on Windows, add objective-c to all-cross on OSX.
Diffstat (limited to 'objective-c/test')
-rw-r--r--objective-c/test/Ice/ami/AMITest.ice2
-rw-r--r--objective-c/test/Ice/ami/TestI.m4
2 files changed, 6 insertions, 0 deletions
diff --git a/objective-c/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice
index b0c0e8606fe..4940c472a6b 100644
--- a/objective-c/test/Ice/ami/AMITest.ice
+++ b/objective-c/test/Ice/ami/AMITest.ice
@@ -30,6 +30,8 @@ interface TestIntf
int opBatchCount();
bool waitForBatch(int count);
void shutdown();
+
+ bool supportsFunctionalTests();
};
interface TestIntfController
diff --git a/objective-c/test/Ice/ami/TestI.m b/objective-c/test/Ice/ami/TestI.m
index 1c4c493540a..37701137c8d 100644
--- a/objective-c/test/Ice/ami/TestI.m
+++ b/objective-c/test/Ice/ami/TestI.m
@@ -90,6 +90,10 @@
}
return NO;
}
+-(BOOL) supportsFunctionalTests:(ICECurrent *)current
+{
+ return NO;
+}
@end
@implementation TestAMITestIntfControllerI