diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-12-17 15:11:41 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-12-17 15:11:41 -0800 |
| commit | 01abd85b7043b2a230f3e0fe2af854fecd73f263 (patch) | |
| tree | deffe92d0a0c83fff57edf7f77e701b43533abd8 /cpp | |
| parent | updating .travis.yml for bluetooth prereqs (diff) | |
| download | ice-01abd85b7043b2a230f3e0fe2af854fecd73f263.tar.bz2 ice-01abd85b7043b2a230f3e0fe2af854fecd73f263.tar.xz ice-01abd85b7043b2a230f3e0fe2af854fecd73f263.zip | |
Travis & C++11 fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Common/Makefile | 3 | ||||
| -rw-r--r-- | cpp/test/Common/TestCommon.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/ami/AllTests.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/Makefile | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/cpp/test/Common/Makefile b/cpp/test/Common/Makefile index d372bdb5ed2..3c8add2c0d9 100644 --- a/cpp/test/Common/Makefile +++ b/cpp/test/Common/Makefile @@ -21,9 +21,6 @@ SLICE_OBJS = Controller.o OBJS = TestCommon.o \ $(SLICE_OBJS) -#HDIR = . -#SDIR = . - include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I$(testincdir) $(CPPFLAGS) -DTEST_API_EXPORTS diff --git a/cpp/test/Common/TestCommon.cpp b/cpp/test/Common/TestCommon.cpp index 967a69e4602..2b5307f1cc3 100644 --- a/cpp/test/Common/TestCommon.cpp +++ b/cpp/test/Common/TestCommon.cpp @@ -84,7 +84,7 @@ RemoteConfig::RemoteConfig(const std::string& name, int argc, char** argv, const } } - Test::Common::ServerPrx server; + Test::Common::ServerPrxPtr server; if(!controllerHost.empty()) { @@ -97,7 +97,7 @@ RemoteConfig::RemoteConfig(const std::string& name, int argc, char** argv, const Test::Common::StringSeq options; - Test::Common::ControllerPrx controller = Test::Common::ControllerPrx::checkedCast( + Test::Common::ControllerPrxPtr controller = ICE_CHECKED_CAST(Test::Common::ControllerPrx, communicator->stringToProxy("controller:tcp -h " + controllerHost + " -p 15000")); server = controller->runServer("cpp", name, prot, host, false, configName, options); server->waitForServer(); diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 0fa6622c6da..9e86403b1b5 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -2057,6 +2057,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } + p->shutdown(); + #else string sref = "test:" + getTestEndpoint(communicator, 0); Ice::ObjectPrx obj = communicator->stringToProxy(sref); @@ -4075,6 +4077,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; } + p->shutdown(); #endif } diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 791d209ab7a..019710e9164 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -10,13 +10,14 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules + ifeq ($(CPP11_MAPPING),yes) -SUBDIRS = IceUtil \ +SUBDIRS = Common \ + IceUtil \ Slice \ Ice else - SUBDIRS = Common \ IceUtil \ Slice \ @@ -31,6 +32,7 @@ SUBDIRS := $(SUBDIRS) \ Glacier2 \ IceGrid endif + endif .PHONY: $(EVERYTHING) $(SUBDIRS) |