From ba0c589263e612130ccd8ebdee4ddbbbe7f28a2e Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 21 Feb 2018 15:50:21 +0100
Subject: Android fixes

- Improved emulator support (no need to specify the AVD name anymore)
- Fixed adapterDeactivation test issue with Android
---
 scripts/tests/Ice/ami.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'scripts/tests')

diff --git a/scripts/tests/Ice/ami.py b/scripts/tests/Ice/ami.py
index 82ccca1a08a..c89436f0da9 100644
--- a/scripts/tests/Ice/ami.py
+++ b/scripts/tests/Ice/ami.py
@@ -8,4 +8,16 @@
 #
 # **********************************************************************
 
-TestSuite(__name__, options = { "compress" : [False], "serialize" : [False] })
+# Enable some tracing to allow investigating test failures
+traceProps = {
+    "Ice.Trace.Network" : 2,
+    "Ice.Trace.Retry" : 1,
+    "Ice.Trace.Protocol" : 1
+}
+
+TestSuite(__name__,
+          [
+            ClientServerTestCase(traceProps=traceProps),
+            CollocatedTestCase()
+          ],
+          options = { "compress" : [False], "serialize" : [False] })
-- 
cgit v1.2.3