diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-13 18:37:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-13 18:37:28 +0200 |
| commit | e305d33203086236280fe918072398918f87d6f4 (patch) | |
| tree | 91e3d323f699af35a0477ea935a6569d4a290dcf /objective-c/test | |
| parent | Add MCPP_HOME for Windows build. (diff) | |
| download | ice-e305d33203086236280fe918072398918f87d6f4.tar.bz2 ice-e305d33203086236280fe918072398918f87d6f4.tar.xz ice-e305d33203086236280fe918072398918f87d6f4.zip | |
Fixed Makefile indentation to use tab witdh=8 and indent width = 4
Diffstat (limited to 'objective-c/test')
30 files changed, 106 insertions, 106 deletions
diff --git a/objective-c/test/Ice/acm/Makefile b/objective-c/test/Ice/acm/Makefile index ba45e28b131..f0214684507 100644 --- a/objective-c/test/Ice/acm/Makefile +++ b/objective-c/test/Ice/acm/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = ACMTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/adapterDeactivation/Makefile b/objective-c/test/Ice/adapterDeactivation/Makefile index 5c2173a9d94..fe9b313495c 100644 --- a/objective-c/test/Ice/adapterDeactivation/Makefile +++ b/objective-c/test/Ice/adapterDeactivation/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = AdapterDeactivationTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/admin/Makefile b/objective-c/test/Ice/admin/Makefile index af39c7ba045..7238e913c5d 100644 --- a/objective-c/test/Ice/admin/Makefile +++ b/objective-c/test/Ice/admin/Makefile @@ -17,11 +17,11 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = AdminTest.o COBJS = Client.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/ami/Makefile b/objective-c/test/Ice/ami/Makefile index 0667e0e7055..42fd31d0c3f 100644 --- a/objective-c/test/Ice/ami/Makefile +++ b/objective-c/test/Ice/ami/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = AMITest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/binding/Makefile b/objective-c/test/Ice/binding/Makefile index a9da9aad0c7..66967b67222 100644 --- a/objective-c/test/Ice/binding/Makefile +++ b/objective-c/test/Ice/binding/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = BindingTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/defaultServant/Makefile b/objective-c/test/Ice/defaultServant/Makefile index 76982f8e7d8..a8441f0f06f 100644 --- a/objective-c/test/Ice/defaultServant/Makefile +++ b/objective-c/test/Ice/defaultServant/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = DefaultServantTest.o COBJS = Client.o \ - MyObjectI.o + MyObjectI.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/defaultValue/Makefile b/objective-c/test/Ice/defaultValue/Makefile index 0fb65a35f58..2c5f304c231 100644 --- a/objective-c/test/Ice/defaultValue/Makefile +++ b/objective-c/test/Ice/defaultValue/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = DefaultValueTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/dispatcher/Makefile b/objective-c/test/Ice/dispatcher/Makefile index f8da9df04cd..7f7fe89a2a9 100644 --- a/objective-c/test/Ice/dispatcher/Makefile +++ b/objective-c/test/Ice/dispatcher/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = DispatcherTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/enums/Makefile b/objective-c/test/Ice/enums/Makefile index 14ab68894c1..ec3b76e4311 100644 --- a/objective-c/test/Ice/enums/Makefile +++ b/objective-c/test/Ice/enums/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = EnumTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/exceptions/Makefile b/objective-c/test/Ice/exceptions/Makefile index 55f32b2a5c2..2b577282191 100644 --- a/objective-c/test/Ice/exceptions/Makefile +++ b/objective-c/test/Ice/exceptions/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ExceptionsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/facets/Makefile b/objective-c/test/Ice/facets/Makefile index 1ed32b66172..dfe06d39140 100644 --- a/objective-c/test/Ice/facets/Makefile +++ b/objective-c/test/Ice/facets/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = FacetsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/faultTolerance/Makefile b/objective-c/test/Ice/faultTolerance/Makefile index 35a7af4753e..91bb733fc39 100644 --- a/objective-c/test/Ice/faultTolerance/Makefile +++ b/objective-c/test/Ice/faultTolerance/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = FaultToleranceTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/hash/Makefile b/objective-c/test/Ice/hash/Makefile index 36e3431b261..37a6ad744cf 100644 --- a/objective-c/test/Ice/hash/Makefile +++ b/objective-c/test/Ice/hash/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = HashTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/hold/Makefile b/objective-c/test/Ice/hold/Makefile index c3a2e3766ea..95c00f56796 100644 --- a/objective-c/test/Ice/hold/Makefile +++ b/objective-c/test/Ice/hold/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = HoldTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/info/Makefile b/objective-c/test/Ice/info/Makefile index 5c5a231ecc6..18309076c93 100644 --- a/objective-c/test/Ice/info/Makefile +++ b/objective-c/test/Ice/info/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = InfoTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/inheritance/Makefile b/objective-c/test/Ice/inheritance/Makefile index 19c3ee7806a..f5d5cf5434c 100644 --- a/objective-c/test/Ice/inheritance/Makefile +++ b/objective-c/test/Ice/inheritance/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = InheritanceTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/interceptor/Makefile b/objective-c/test/Ice/interceptor/Makefile index 5b75eed1931..07caf565409 100644 --- a/objective-c/test/Ice/interceptor/Makefile +++ b/objective-c/test/Ice/interceptor/Makefile @@ -16,8 +16,8 @@ TARGETS = $(CLIENT) SLICE_OBJS = InterceptorTest.o COBJS = Client.o \ - InterceptorI.o \ - MyObjectI.o \ + InterceptorI.o \ + MyObjectI.o \ OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/invoke/Makefile b/objective-c/test/Ice/invoke/Makefile index 4131daa6bf3..b08e9fefd35 100644 --- a/objective-c/test/Ice/invoke/Makefile +++ b/objective-c/test/Ice/invoke/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = InvokeTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = BlobjectI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/location/Makefile b/objective-c/test/Ice/location/Makefile index aedb3040ca3..f7b2fce927b 100644 --- a/objective-c/test/Ice/location/Makefile +++ b/objective-c/test/Ice/location/Makefile @@ -17,11 +17,11 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = LocationTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - ServerLocator.o \ - Server.o + ServerLocator.o \ + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/metrics/Makefile b/objective-c/test/Ice/metrics/Makefile index 4903fcb6485..e169cf218b1 100644 --- a/objective-c/test/Ice/metrics/Makefile +++ b/objective-c/test/Ice/metrics/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = MetricsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/objects/Makefile b/objective-c/test/Ice/objects/Makefile index 6dbc4fdb29d..91beb498cb8 100644 --- a/objective-c/test/Ice/objects/Makefile +++ b/objective-c/test/Ice/objects/Makefile @@ -18,15 +18,15 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ObjectsTest.o COBJS = Client.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/operations/Makefile b/objective-c/test/Ice/operations/Makefile index 3bab9f10ded..c9e41667385 100644 --- a/objective-c/test/Ice/operations/Makefile +++ b/objective-c/test/Ice/operations/Makefile @@ -18,31 +18,31 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = OperationsTest.o COBJS = Client.o \ - AllTests.o \ + AllTests.o \ Twoways.o \ - TwowaysNewAMI.o \ - Oneways.o \ - OnewaysNewAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o + TwowaysNewAMI.o \ + Oneways.o \ + OnewaysNewAMI.o \ + BatchOneways.o \ + BatchOnewaysAMI.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o \ + TestI.o \ + AllTests.o \ Twoways.o \ - TwowaysNewAMI.o \ - Oneways.o \ - OnewaysNewAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o + TwowaysNewAMI.o \ + Oneways.o \ + OnewaysNewAMI.o \ + BatchOneways.o \ + BatchOnewaysAMI.o OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) \ - $(SLICE_OBJS) + $(SOBJS) \ + $(COLOBJS) \ + $(SLICE_OBJS) include $(top_srcdir)/config/Make.rules diff --git a/objective-c/test/Ice/optional/Makefile b/objective-c/test/Ice/optional/Makefile index 0a40f34414b..dc8be04230a 100644 --- a/objective-c/test/Ice/optional/Makefile +++ b/objective-c/test/Ice/optional/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = OptionalTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/proxy/Makefile b/objective-c/test/Ice/proxy/Makefile index 1ecb047ee9e..ac7a3934ca2 100644 --- a/objective-c/test/Ice/proxy/Makefile +++ b/objective-c/test/Ice/proxy/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ProxyTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/retry/Makefile b/objective-c/test/Ice/retry/Makefile index f96056146bc..e211cdec369 100644 --- a/objective-c/test/Ice/retry/Makefile +++ b/objective-c/test/Ice/retry/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = RetryTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/servantLocator/Makefile b/objective-c/test/Ice/servantLocator/Makefile index 0a0fdea6eed..bef117e91ae 100644 --- a/objective-c/test/Ice/servantLocator/Makefile +++ b/objective-c/test/Ice/servantLocator/Makefile @@ -18,16 +18,16 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ServantLocatorTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - ServantLocatorI.o \ - Server.o + ServantLocatorI.o \ + Server.o COLOBJS = TestI.o \ - ServantLocatorI.o \ - AllTests.o \ - Collocated.o + ServantLocatorI.o \ + AllTests.o \ + Collocated.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/services/Makefile b/objective-c/test/Ice/services/Makefile index ced9094f279..0a159c4515d 100644 --- a/objective-c/test/Ice/services/Makefile +++ b/objective-c/test/Ice/services/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = ServicesTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/slicing/exceptions/Makefile b/objective-c/test/Ice/slicing/exceptions/Makefile index b67fcc04b3c..51974dc089c 100644 --- a/objective-c/test/Ice/slicing/exceptions/Makefile +++ b/objective-c/test/Ice/slicing/exceptions/Makefile @@ -15,15 +15,15 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = SlicingExceptionsTestClient.o \ - SlicingExceptionsTestServer.o + SlicingExceptionsTestServer.o COBJS = Client.o \ - AllTests.o \ - SlicingExceptionsTestClient.o + AllTests.o \ + SlicingExceptionsTestClient.o SOBJS = TestI.o \ - Server.o \ - SlicingExceptionsTestServer.o + Server.o \ + SlicingExceptionsTestServer.o OBJS = $(COBJS) $(SOBJS) diff --git a/objective-c/test/Ice/slicing/objects/Makefile b/objective-c/test/Ice/slicing/objects/Makefile index 4a2a8876ab2..b7d9bd94d1b 100644 --- a/objective-c/test/Ice/slicing/objects/Makefile +++ b/objective-c/test/Ice/slicing/objects/Makefile @@ -15,19 +15,19 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = SlicingObjectsTestClient.o \ - SlicingObjectsForwardClient.o \ - SlicingObjectsTestServer.o \ - SlicingObjectsForwardServer.o + SlicingObjectsForwardClient.o \ + SlicingObjectsTestServer.o \ + SlicingObjectsForwardServer.o COBJS = SlicingObjectsTestClient.o \ - SlicingObjectsForwardClient.o \ - Client.o \ - AllTests.o + SlicingObjectsForwardClient.o \ + Client.o \ + AllTests.o SOBJS = SlicingObjectsTestServer.o \ - SlicingObjectsForwardServer.o \ - TestI.o \ - Server.o + SlicingObjectsForwardServer.o \ + TestI.o \ + Server.o OBJS = $(COBJS) $(SOBJS) diff --git a/objective-c/test/Ice/timeout/Makefile b/objective-c/test/Ice/timeout/Makefile index 9e6ba54dad3..62d0fdaa9d4 100644 --- a/objective-c/test/Ice/timeout/Makefile +++ b/objective-c/test/Ice/timeout/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = TimeoutTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) |