diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-11-17 14:40:50 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-11-17 14:40:50 -0330 |
| commit | 5acf19933aba1678dc761d655d648815eadd45a8 (patch) | |
| tree | d4290730382ce8e002fa81a7f081e29f12b7dcd6 /android/test | |
| parent | ICE-5912 - Fix demos that still use PEM to use PKCS12 (diff) | |
| download | ice-5acf19933aba1678dc761d655d648815eadd45a8.tar.bz2 ice-5acf19933aba1678dc761d655d648815eadd45a8.tar.xz ice-5acf19933aba1678dc761d655d648815eadd45a8.zip | |
Removed bogus tracing.
Removed the test_ice_acm.iml module.
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java | 1 | ||||
| -rw-r--r-- | android/test/src/test_Ice_acm/test_Ice_acm.iml | 39 |
2 files changed, 0 insertions, 40 deletions
diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java index aea2ef13c99..e0e1798abe1 100644 --- a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java +++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java @@ -486,7 +486,6 @@ public class TestApp extends Application args.add("--Ice.Default.Protocol=wss"); break; } - args.add("--Ice.Trace.Network=3"); } }; private Mode _mode = Mode.TCP; diff --git a/android/test/src/test_Ice_acm/test_Ice_acm.iml b/android/test/src/test_Ice_acm/test_Ice_acm.iml deleted file mode 100644 index f96c16a500d..00000000000 --- a/android/test/src/test_Ice_acm/test_Ice_acm.iml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6b" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="android-gradle" name="Android-Gradle"> - <configuration> - <option name="GRADLE_PROJECT_PATH" value=":test_Ice_acm" /> - </configuration> - </facet> - <facet type="java-gradle" name="Java-Gradle"> - <configuration> - <option name="BUILD_FOLDER_PATH" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <content url="file://$MODULE_DIR$/../../build/generated-src"> - <sourceFolder url="file://$MODULE_DIR$/../../build/generated-src" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <content url="file://$MODULE_DIR$/../../../../java/test/src/main/java"> - <sourceFolder url="file://$MODULE_DIR$/../../../../java/test/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="test" exported="" /> - </component> -</module> - |