summaryrefslogtreecommitdiff
path: root/scripts/Component.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-07-20 19:19:30 +0200
committerJose <jose@zeroc.com>2018-07-20 19:19:30 +0200
commitf831849a119aa592d207fd38428517b414c2b39d (patch)
tree88c4d1c69072ad45eda621079f0d1d8b89a1fd8e /scripts/Component.py
parentUpdate Travis CI build to use ubuntu-18.04 (diff)
downloadice-f831849a119aa592d207fd38428517b414c2b39d.tar.bz2
ice-f831849a119aa592d207fd38428517b414c2b39d.tar.xz
ice-f831849a119aa592d207fd38428517b414c2b39d.zip
Xamarin testsuite
Diffstat (limited to 'scripts/Component.py')
-rw-r--r--scripts/Component.py29
1 files changed, 28 insertions, 1 deletions
diff --git a/scripts/Component.py b/scripts/Component.py
index 59b21b38807..65bc096734c 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -95,6 +95,20 @@ class Ice(Component):
"Ice/threadPoolPriority"])
elif isinstance(platform, Windows) and platform.getCompiler() in ["VC100"]:
return (["Ice/.*", "IceSSL/.*", "IceBox/.*", "IceDiscovery/.*", "IceUtil/.*", "Slice/.*"], [])
+ elif (isinstance(mapping, XamarinMapping)):
+ return (["Ice/.*"],
+ ["Ice/hash",
+ "Ice/faultTolerance",
+ "Ice/metrics",
+ "Ice/assemblies",
+ "Ice/background",
+ "Ice/dispatcher",
+ "Ice/networkProxy",
+ "Ice/throughput",
+ "Ice/plugin",
+ "Ice/logger",
+ "Ice/properties",
+ "Ice/slicing/*"])
elif isinstance(mapping, AndroidMappingMixin):
return (["Ice/.*"],
["Ice/hash",
@@ -135,9 +149,17 @@ class Ice(Component):
elif parent in ["Glacier2"] and testId not in ["Glacier2/application", "Glacier2/sessionHelper"]:
return False
+ if isinstance(mapping, XamarinAndroidMapping) or isinstance(mapping, XamarinIOSMapping):
+ #
+ # With Xamarin on Android and iOS Ice/udp is only supported with IPv4
+ #
+ if current.config.ipv6 and testId in ["Ice/udp"]:
+ return False
+
+
# IceSSL test doesn't work on macOS/.NET Core
if isinstance(mapping, CSharpMapping) and isinstance(platform, Darwin) and parent in ["IceSSL"]:
- return False
+ return False
return True
@@ -244,9 +266,14 @@ try:
run("adb version")
Mapping.add(os.path.join("java-compat", "android"), AndroidCompatMapping())
Mapping.add(os.path.join("java", "android"), AndroidMapping())
+ Mapping.add(os.path.join("csharp", "xamarin", "android"), XamarinAndroidMapping())
except:
pass
+if isinstance(platform, Windows):
+ Mapping.add(os.path.join("csharp", "xamarin", "uwp"), XamarinUWPMapping())
+Mapping.add(os.path.join("csharp", "xamarin", "ios"), XamarinIOSMapping())
+
#
# Check if Matlab is installed and eventually add the Matlab mapping
#