diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-23 11:23:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-23 11:23:29 +0100 |
| commit | 6d28421984c94e795b0b79cc8ae4e114e6c9b143 (patch) | |
| tree | 40b709ad34d15abda4ff3bd99d30fbbe2de6f1b5 | |
| parent | py -> python (diff) | |
| download | ice-6d28421984c94e795b0b79cc8ae4e114e6c9b143.tar.bz2 ice-6d28421984c94e795b0b79cc8ae4e114e6c9b143.tar.xz ice-6d28421984c94e795b0b79cc8ae4e114e6c9b143.zip | |
Objective-C test fixes for IceTouch
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/AllTests.m | 3 | ||||
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/Client.m | 2 | ||||
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice (renamed from objective-c/test/Ice/faultTolerance/Test.ice) | 0 | ||||
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/Makefile | 2 | ||||
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/TestI.h | 3 | ||||
| -rw-r--r-- | objective-c/test/Ice/faultTolerance/TestI.m | 1 | ||||
| -rw-r--r-- | objective-c/test/Ice/servantLocator/AllTests.m | 2 | ||||
| -rw-r--r-- | objective-c/test/Ice/servantLocator/ServantLocatorI.m | 2 |
8 files changed, 6 insertions, 9 deletions
diff --git a/objective-c/test/Ice/faultTolerance/AllTests.m b/objective-c/test/Ice/faultTolerance/AllTests.m index 767816d2d74..2d58764c0fe 100644 --- a/objective-c/test/Ice/faultTolerance/AllTests.m +++ b/objective-c/test/Ice/faultTolerance/AllTests.m @@ -9,7 +9,7 @@ #import <objc/Ice.h> #import <TestCommon.h> -#import <faultTolerance/Test.h> +#import <FaultToleranceTest.h> #import <Foundation/Foundation.h> @@ -281,4 +281,3 @@ allTests(id<ICECommunicator> communicator, NSArray* ports) tprintf("ok\n"); } } - diff --git a/objective-c/test/Ice/faultTolerance/Client.m b/objective-c/test/Ice/faultTolerance/Client.m index 6875b4f46c3..e5a5421437b 100644 --- a/objective-c/test/Ice/faultTolerance/Client.m +++ b/objective-c/test/Ice/faultTolerance/Client.m @@ -9,7 +9,7 @@ #import <objc/Ice.h> #import <TestCommon.h> -#import <faultTolerance/Test.h> +#import <FaultToleranceTest.h> #import <stdio.h> void diff --git a/objective-c/test/Ice/faultTolerance/Test.ice b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice index d5488ad5726..d5488ad5726 100644 --- a/objective-c/test/Ice/faultTolerance/Test.ice +++ b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice diff --git a/objective-c/test/Ice/faultTolerance/Makefile b/objective-c/test/Ice/faultTolerance/Makefile index 4c7d3b3c6e1..35a7af4753e 100644 --- a/objective-c/test/Ice/faultTolerance/Makefile +++ b/objective-c/test/Ice/faultTolerance/Makefile @@ -14,7 +14,7 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Test.o +SLICE_OBJS = FaultToleranceTest.o COBJS = Client.o \ AllTests.o diff --git a/objective-c/test/Ice/faultTolerance/TestI.h b/objective-c/test/Ice/faultTolerance/TestI.h index dc238000725..ae9feff3230 100644 --- a/objective-c/test/Ice/faultTolerance/TestI.h +++ b/objective-c/test/Ice/faultTolerance/TestI.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#import <faultTolerance/Test.h> +#import <FaultToleranceTest.h> @interface TestI : TestTestIntf<TestTestIntf> @end - diff --git a/objective-c/test/Ice/faultTolerance/TestI.m b/objective-c/test/Ice/faultTolerance/TestI.m index 22045e610d7..a529b67f79c 100644 --- a/objective-c/test/Ice/faultTolerance/TestI.m +++ b/objective-c/test/Ice/faultTolerance/TestI.m @@ -33,4 +33,3 @@ return getpid(); } @end - diff --git a/objective-c/test/Ice/servantLocator/AllTests.m b/objective-c/test/Ice/servantLocator/AllTests.m index 3cc3fca14c2..a390d456fc1 100644 --- a/objective-c/test/Ice/servantLocator/AllTests.m +++ b/objective-c/test/Ice/servantLocator/AllTests.m @@ -9,7 +9,7 @@ #import <objc/Ice.h> #import <TestCommon.h> -#import <servantLocator/ServantLocatorTest.h> +#import <ServantLocatorTest.h> void testExceptions(id<TestServantLocatorTestIntfPrx> obj) diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorI.m b/objective-c/test/Ice/servantLocator/ServantLocatorI.m index 9835ff42626..86830c15702 100644 --- a/objective-c/test/Ice/servantLocator/ServantLocatorI.m +++ b/objective-c/test/Ice/servantLocator/ServantLocatorI.m @@ -7,7 +7,7 @@ // // ********************************************************************** -#import <servantLocator/ServantLocatorTest.h> +#import <ServantLocatorTest.h> #import <servantLocator/ServantLocatorI.h> #import <TestCommon.h> |