diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-03-25 13:11:37 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-03-25 13:11:37 -0700 |
| commit | b12e7da5fd988e6a1e4bd954bff8afcfaf3e9e56 (patch) | |
| tree | 4face8ed582437d5dcd57f1112d35755ce687bb3 /csharp | |
| parent | ICE-7064 - csharp IceSSL\configuration fixes (diff) | |
| download | ice-b12e7da5fd988e6a1e4bd954bff8afcfaf3e9e56.tar.bz2 ice-b12e7da5fd988e6a1e4bd954bff8afcfaf3e9e56.tar.xz ice-b12e7da5fd988e6a1e4bd954bff8afcfaf3e9e56.zip | |
Unity fixes
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/test/Ice/admin/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/enums/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/enums/Server.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/faultTolerance/TestI.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/metrics/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/metrics/Collocated.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/metrics/Server.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceBox/admin/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Makefile.mak | 6 |
9 files changed, 14 insertions, 8 deletions
diff --git a/csharp/test/Ice/admin/Client.cs b/csharp/test/Ice/admin/Client.cs index c651a20271c..ef157470e0a 100644 --- a/csharp/test/Ice/admin/Client.cs +++ b/csharp/test/Ice/admin/Client.cs @@ -30,7 +30,7 @@ public class Client int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Ice/enums/Client.cs b/csharp/test/Ice/enums/Client.cs index 7472c2cf50d..0f55d9f44cf 100644 --- a/csharp/test/Ice/enums/Client.cs +++ b/csharp/test/Ice/enums/Client.cs @@ -31,7 +31,7 @@ public class Client int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Ice/enums/Server.cs b/csharp/test/Ice/enums/Server.cs index 750c24ae3cb..752c68ae649 100644 --- a/csharp/test/Ice/enums/Server.cs +++ b/csharp/test/Ice/enums/Server.cs @@ -37,7 +37,7 @@ public class Server int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Ice/faultTolerance/TestI.cs b/csharp/test/Ice/faultTolerance/TestI.cs index 4207de0179d..ce35ae896a3 100644 --- a/csharp/test/Ice/faultTolerance/TestI.cs +++ b/csharp/test/Ice/faultTolerance/TestI.cs @@ -26,7 +26,9 @@ public sealed class TestI : TestIntfDisp_ private void commitSuicide() { +#if !UNITY _p.Kill(); +#endif Thread.Sleep(5000); // Give other threads time to die. } diff --git a/csharp/test/Ice/metrics/Client.cs b/csharp/test/Ice/metrics/Client.cs index de06956792c..47f84a300e9 100644 --- a/csharp/test/Ice/metrics/Client.cs +++ b/csharp/test/Ice/metrics/Client.cs @@ -31,7 +31,7 @@ public class Client int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs index 3d192110c4e..d7ea036c054 100644 --- a/csharp/test/Ice/metrics/Collocated.cs +++ b/csharp/test/Ice/metrics/Collocated.cs @@ -40,7 +40,7 @@ public class Collocated int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Ice/metrics/Server.cs b/csharp/test/Ice/metrics/Server.cs index fd9c51c492b..c6535448e92 100644 --- a/csharp/test/Ice/metrics/Server.cs +++ b/csharp/test/Ice/metrics/Server.cs @@ -39,7 +39,7 @@ public class Server int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/IceBox/admin/Client.cs b/csharp/test/IceBox/admin/Client.cs index 13cb6353aee..8687ffd392a 100644 --- a/csharp/test/IceBox/admin/Client.cs +++ b/csharp/test/IceBox/admin/Client.cs @@ -36,7 +36,7 @@ public class Client int status = 0; Ice.Communicator communicator = null; -#if !COMPACT +#if !COMPACT && !UNITY Debug.Listeners.Add(new ConsoleTraceListener()); #endif diff --git a/csharp/test/Makefile.mak b/csharp/test/Makefile.mak index 6638917919c..b4f86e9c829 100644 --- a/csharp/test/Makefile.mak +++ b/csharp/test/Makefile.mak @@ -17,9 +17,13 @@ SUBDIRS = Slice \ IceBox \ Glacier2 \ IceGrid \ - IceSSL \ IceDiscovery +!if "$(UNITY)" != "yes" +SUBDIRS = $(SUBDIRS) \ + IceSSL +!endif + $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ @echo "making $@ in %i" && \ |