diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
| commit | 884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch) | |
| tree | 53d2123abf22042f827d0e83b6093cea038c3b3a /cpp/test/include | |
| parent | Merge branch '3.6' (diff) | |
| download | ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2 ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip | |
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'cpp/test/include')
| -rw-r--r-- | cpp/test/include/.gitignore | 4 | ||||
| -rw-r--r-- | cpp/test/include/TestCommon.h | 33 |
2 files changed, 36 insertions, 1 deletions
diff --git a/cpp/test/include/.gitignore b/cpp/test/include/.gitignore new file mode 100644 index 00000000000..05cdd03c294 --- /dev/null +++ b/cpp/test/include/.gitignore @@ -0,0 +1,4 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +Controller.h diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index 1a6261ee080..d5b2585c627 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -10,7 +10,8 @@ #ifndef TEST_COMMON_H #define TEST_COMMON_H -#include <IceUtil/IceUtil.h> +#include <Ice/CommunicatorF.h> +#include <Ice/ProxyF.h> #ifdef ICE_CPP11_MAPPING # define ICE_IN(T) T @@ -24,6 +25,18 @@ # include <Ice/LocalException.h> #endif +#include <IceUtil/IceUtil.h> + +#ifndef TEST_API +# ifdef TEST_API_EXPORTS +# define TEST_API ICE_DECLSPEC_EXPORT +# elif defined(ICE_STATIC_LIBS) +# define TEST_API /**/ +# else +# define TEST_API ICE_DECLSPEC_IMPORT +# endif +#endif + void inline print(const std::string& msg) { @@ -36,6 +49,24 @@ inline println(const std::string& msg) std::cout << msg << std::endl; } +TEST_API std::string getTestEndpoint(const Ice::CommunicatorPtr&, int, const std::string = std::string()); + +class TEST_API RemoteConfig +{ +public: + + RemoteConfig(const std::string&, int, char**, const Ice::CommunicatorPtr&); + ~RemoteConfig(); + + bool isRemote() const; + void finished(int); + +private: + + Ice::ObjectPrxPtr _server; + int _status; +}; + #if !defined(ICE_OS_WINRT) && (TARGET_OS_IPHONE == 0) void |