Only add csharp to all-cross on Windows, add objective-c to all-cross on OSX.

3 files changed, 17 insertions, 3 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
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 04d91782910..0612db25079 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -395,7 +395,7 @@ if not iceHome:
 crossTests = [ "Ice/adapterDeactivation",
                #"Ice/background",
                "Ice/binding",
-               "Ice/checksum",
+               #"Ice/checksum",
                #"Ice/custom",
                "Ice/ami",
                "Ice/info",
@@ -592,9 +592,17 @@ def run(tests, root = False):
 
     if allCross:
         if len(cross) == 0:
-            cross = ["cpp", "java", "js", "csharp" ]
+            cross = ["cpp", "java", "js"]
+            if isWin32():
+                cross.append("csharp")
+            if isDarwin():
+                cross.append("objective-c")
         if root:
-            allLang = ["cpp", "java", "js", "csharp" ]
+            allLang = ["cpp", "java", "js"]
+            if isWin32():
+                allLang.append("csharp")
+            if isDarwin():
+                allLang.append("objective-c")
         else:
             allLang = [ getDefaultMapping() ]
         for lang in allLang: