diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-12 15:53:25 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-12 15:53:25 +0200 |
| commit | f9c48af84ae5f3a47989b018f40968b5f94b9732 (patch) | |
| tree | 66e371665c86aa2d38b0ebfbd3faaa2a6399c6cc /android/test | |
| parent | ICE-6491 duplicate error for invalid class/interface names (diff) | |
| download | ice-f9c48af84ae5f3a47989b018f40968b5f94b9732.tar.bz2 ice-f9c48af84ae5f3a47989b018f40968b5f94b9732.tar.xz ice-f9c48af84ae5f3a47989b018f40968b5f94b9732.zip | |
Fixed ICE-6501: android SSL test failure and other minor Android test failures
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/android/testApp.iml | 1 | ||||
| -rw-r--r-- | android/test/plugins/testPlugins.iml | 3 | ||||
| -rw-r--r-- | android/test/test.iml | 11 |
3 files changed, 1 insertions, 14 deletions
diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml index fc18c20225a..e66d198f1a5 100644 --- a/android/test/android/testApp.iml +++ b/android/test/android/testApp.iml @@ -80,6 +80,7 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml index ee90eee40f4..0f683bdf790 100644 --- a/android/test/plugins/testPlugins.iml +++ b/android/test/plugins/testPlugins.iml @@ -23,9 +23,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build/classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <content url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java"> <sourceFolder url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java" isTestSource="false" /> diff --git a/android/test/test.iml b/android/test/test.iml index 8e9783f4de2..a661ca53b1c 100644 --- a/android/test/test.iml +++ b/android/test/test.iml @@ -23,17 +23,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build/classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/libs" /> - <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/set2.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/set3.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/set4.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/set5.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/set6.d.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/slice2freezej.df.xml" /> - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <content url="file://$MODULE_DIR$/../../java/test/src/main/java"> <sourceFolder url="file://$MODULE_DIR$/../../java/test/src/main/java" isTestSource="false" /> |