diff options
| author | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
| commit | db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2 (patch) | |
| tree | 3c05d7f841a1585360d0a6450748fd6dc26b050c | |
| parent | fixing .gitignore in checksum test (diff) | |
| parent | Update Ice Builder for Gradle version to 1.2.1 (diff) | |
| download | ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.bz2 ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.xz ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.zip | |
Merge remote-tracking branch 'origin/3.6'
151 files changed, 1123 insertions, 320 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md index 402c7978e3c..e15a59fe4a7 100644 --- a/CHANGELOG-3.6.md +++ b/CHANGELOG-3.6.md @@ -8,23 +8,27 @@ We recommend that you use the release notes as a guide for migrating your applications to this release, and the manual for complete details on a particular aspect of Ice. -- [Changes in Ice 3.6.1](#changes-in-ice-361) +- [Changes in Ice 3.6.2](#changes-in-ice-362) + - [General Changes](#general-changes) - [C++ Changes](#c-changes) + - [C# Changes](#c-changes-1) + - [Java Changes](#java-changes) + - [Ruby Changes](#ruby-changes) - [Changes in Ice 3.6.1](#changes-in-ice-361) - - [General Changes](#general-changes) - - [C++ Changes](#c-changes-1) + - [General Changes](#general-changes-1) + - [C++ Changes](#c-changes-2) - [JavaScript Changes](#javascript-changes) - [PHP Changes](#php-changes) - [Changes in Ice 3.6.0](#changes-in-ice-360) - - [General Changes](#general-changes-1) - - [C++ Changes](#c-changes-2) - - [C# Changes](#c#-changes) - - [Java Changes](#java-changes) + - [General Changes](#general-changes-2) + - [C++ Changes](#c-changes-3) + - [C# Changes](#c-changes-4) + - [Java Changes](#java-changes-1) - [JavaScript Changes](#javascript-changes-1) - [Objective-C Changes](#objective-c-changes) - [PHP Changes](#php-changes-1) - [Python Changes](#python-changes) - - [Ruby Changes](#ruby-changes) + - [Ruby Changes](#ruby-changes-1) # Changes in Ice 3.6.2 diff --git a/cpp/config/makegitignore.py b/cpp/config/makegitignore.py index 6d593b3b9e3..28f167722de 100755 --- a/cpp/config/makegitignore.py +++ b/cpp/config/makegitignore.py @@ -101,9 +101,9 @@ def usage(): print "-h Show this message." print -icee = False + try: - opts, args = getopt.getopt(sys.argv[1:], "he") + opts, args = getopt.getopt(sys.argv[1:], "h") except getopt.GetoptError: usage() sys.exit(1) @@ -111,8 +111,7 @@ for o, a in opts: if o == "-h": usage() sys.exit(0) - elif o == "-e": - icee = True + if len(args) != 0: usage() sys.exit(1) @@ -129,10 +128,8 @@ else: print("cannot find top-level directory") sys.exit(1) -if icee: - makefiles = find(os.path.join(toplevel, "cppe"), "Makefile") -else: - makefiles = find(os.path.join(toplevel, "cpp"), "Makefile") + +makefiles = find(os.path.join(toplevel, "cpp"), "Makefile") cwd = os.getcwd() gitIgnoreFiles = { } for i in makefiles: @@ -149,15 +146,15 @@ for i in makefiles: os.chdir(cwd) -excludePath = [ os.path.join(toplevel, "cpp", "bin"), os.path.join(toplevel, "cpp", "lib"), \ - os.path.join(toplevel, "cppe", "bin"), os.path.join(toplevel, "cppe", "lib") ] +excludePath = [ os.path.join(toplevel, "cpp", "bin"), os.path.join(toplevel, "cpp", "lib") ] for (path, files) in gitIgnoreFiles.iteritems(): if os.path.dirname(path) in excludePath: continue if not os.path.exists(path): print files - gitIgnore = open(path, "w") - gitIgnore.write(preamble); - gitIgnore.writelines(files) - gitIgnore.close() + if os.path.isdir(os.path.dirname(path)): + gitIgnore = open(path, "w") + gitIgnore.write(preamble); + gitIgnore.writelines(files) + gitIgnore.close() diff --git a/cpp/include/Ice/.gitignore b/cpp/include/Ice/.gitignore index fd7066fcaa2..ac34a90a522 100644 --- a/cpp/include/Ice/.gitignore +++ b/cpp/include/Ice/.gitignore @@ -2,42 +2,42 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! BuiltinSequences.h -CommunicatorF.h Communicator.h -ConnectionF.h +CommunicatorF.h Connection.h +ConnectionF.h Current.h Endpoint.h EndpointF.h EndpointTypes.h FacetMap.h Identity.h -ImplicitContextF.h ImplicitContext.h +ImplicitContextF.h +Instrumentation.h +InstrumentationF.h LocalException.h -LocatorF.h Locator.h -LoggerF.h +LocatorF.h Logger.h +LoggerF.h Metrics.h -ObjectAdapterF.h ObjectAdapter.h -ObjectFactoryF.h +ObjectAdapterF.h ObjectFactory.h -Instrumentation.h -InstrumentationF.h -PluginF.h +ObjectFactoryF.h Plugin.h -ProcessF.h +PluginF.h Process.h -PropertiesF.h -PropertiesAdmin.h +ProcessF.h Properties.h +PropertiesAdmin.h +PropertiesF.h RemoteLogger.h -RouterF.h Router.h -ServantLocatorF.h +RouterF.h ServantLocator.h +ServantLocatorF.h SliceChecksumDict.h ValueFactoryF.h ValueFactory.h diff --git a/cpp/include/IceGrid/.gitignore b/cpp/include/IceGrid/.gitignore index 195635b503d..9d13a816fbf 100644 --- a/cpp/include/IceGrid/.gitignore +++ b/cpp/include/IceGrid/.gitignore @@ -2,14 +2,13 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! Admin.h -Discovery.h +Descriptor.h Exception.h FileParser.h Locator.h +Observer.h +PluginFacade.h Query.h Registry.h Session.h -Observer.h -Descriptor.h UserAccountMapper.h -PluginFacade.h diff --git a/cpp/include/IceSSL/.gitignore b/cpp/include/IceSSL/.gitignore index f53e54c68e3..8ff8c54a7de 100644 --- a/cpp/include/IceSSL/.gitignore +++ b/cpp/include/IceSSL/.gitignore @@ -1,5 +1,5 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! -EndpointInfo.h ConnectionInfo.h +EndpointInfo.h diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index 3b148f5dce4..7d5c478834d 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -40,6 +40,11 @@ ICE_UTIL_API bool fileExists(const std::string&); // ICE_UTIL_API bool directoryExists(const std::string&); +// +// Determine if a directory exists and is empty. +// +ICE_UTIL_API bool isEmptyDirectory(const std::string&); + #ifdef _WIN32 #if defined(__MINGW32__) diff --git a/cpp/src/FreezeScript/.gitignore b/cpp/src/FreezeScript/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/FreezeScript/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/Glacier2/.gitignore b/cpp/src/Glacier2/.gitignore index 7cc85ffc850..093e464bbf3 100644 --- a/cpp/src/Glacier2/.gitignore +++ b/cpp/src/Glacier2/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend Instrumentation.cpp Instrumentation.h diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore b/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/Glacier2Lib/.gitignore b/cpp/src/Glacier2Lib/.gitignore index f4cc829053e..95b4c5cf67d 100644 --- a/cpp/src/Glacier2Lib/.gitignore +++ b/cpp/src/Glacier2Lib/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend Metrics.cpp PermissionsVerifierF.cpp PermissionsVerifier.cpp diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore index 39ff616d0f3..0254d46a775 100644 --- a/cpp/src/Ice/.gitignore +++ b/cpp/src/Ice/.gitignore @@ -1,82 +1,84 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend BuiltinSequences.cpp -CommunicatorF.cpp Communicator.cpp -ConnectionF.cpp +CommunicatorF.cpp Connection.cpp +ConnectionF.cpp Current.cpp Endpoint.cpp EndpointF.cpp EndpointTypes.cpp FacetMap.cpp Identity.cpp -ImplicitContextF.cpp ImplicitContext.cpp +ImplicitContextF.cpp +Instrumentation.cpp +InstrumentationF.cpp LocalException.cpp -LocatorF.cpp Locator.cpp -LoggerF.cpp +LocatorF.cpp Logger.cpp +LoggerF.cpp Metrics.cpp -ObjectAdapterF.cpp ObjectAdapter.cpp -ObjectFactoryF.cpp +ObjectAdapterF.cpp ObjectFactory.cpp -Instrumentation.cpp -InstrumentationF.cpp -PluginF.cpp +ObjectFactoryF.cpp Plugin.cpp -ProcessF.cpp +PluginF.cpp Process.cpp -PropertiesF.cpp -PropertiesAdmin.cpp +ProcessF.cpp Properties.cpp +PropertiesAdmin.cpp +PropertiesF.cpp RemoteLogger.cpp -RouterF.cpp Router.cpp -ServantLocatorF.cpp +RouterF.cpp ServantLocator.cpp +ServantLocatorF.cpp SliceChecksumDict.cpp ValueFactory.cpp Version.cpp BuiltinSequences.h -CommunicatorF.h Communicator.h -ConnectionF.h +CommunicatorF.h Connection.h +ConnectionF.h Current.h Endpoint.h EndpointF.h EndpointTypes.h FacetMap.h Identity.h -ImplicitContextF.h ImplicitContext.h +ImplicitContextF.h +Instrumentation.h +InstrumentationF.h LocalException.h -LocatorF.h Locator.h -LoggerF.h +LocatorF.h Logger.h +LoggerF.h Metrics.h -ObjectAdapterF.h ObjectAdapter.h -ObjectFactoryF.h +ObjectAdapterF.h ObjectFactory.h -Instrumentation.h -InstrumentationF.h -PluginF.h +ObjectFactoryF.h Plugin.h -ProcessF.h +PluginF.h Process.h -PropertiesF.h -PropertiesAdmin.h +ProcessF.h Properties.h +PropertiesAdmin.h +PropertiesF.h RemoteLogger.h -RouterF.h Router.h -ServantLocatorF.h +RouterF.h ServantLocator.h +ServantLocatorF.h SliceChecksumDict.h Version.h diff --git a/cpp/src/IceBox/.gitignore b/cpp/src/IceBox/.gitignore index 03d4ede8a70..c483621af47 100644 --- a/cpp/src/IceBox/.gitignore +++ b/cpp/src/IceBox/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend IceBox.cpp IceBox.h diff --git a/cpp/src/IceDiscovery/.gitignore b/cpp/src/IceDiscovery/.gitignore index 7ba1aabfc02..07790f7db33 100644 --- a/cpp/src/IceDiscovery/.gitignore +++ b/cpp/src/IceDiscovery/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend IceDiscovery.cpp IceDiscovery.h diff --git a/cpp/src/IceGrid/.gitignore b/cpp/src/IceGrid/.gitignore index 41d881d4e8a..0115ebcad98 100644 --- a/cpp/src/IceGrid/.gitignore +++ b/cpp/src/IceGrid/.gitignore @@ -1,11 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! -DBTypes.cpp -DBTypes.h -IceLocatorDiscovery.cpp -IceLocatorDiscovery.h +.depend +.depend Internal.cpp +IceLocatorDiscovery.cpp +DBTypes.cpp Internal.h DBTypes.h DBTypes.cpp diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index 8eb7cb0e629..f6d4317df5b 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -251,8 +251,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - StringSeq files = IcePatch2Internal::readDirectory(dbPath); - if(!files.empty()) + if(!IceUtilInternal::isEmptyDirectory(dbPath)) { cerr << argv[0] << ": output directory is not empty: " << dbPath << endl; return EXIT_FAILURE; diff --git a/cpp/src/IceGridLib/.gitignore b/cpp/src/IceGridLib/.gitignore index 2a86c159391..9d7a58ce79a 100644 --- a/cpp/src/IceGridLib/.gitignore +++ b/cpp/src/IceGridLib/.gitignore @@ -1,27 +1,27 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend Admin.cpp -Discovery.cpp +Descriptor.cpp Exception.cpp FileParser.cpp Locator.cpp +Observer.cpp +PluginFacade.cpp Query.cpp Registry.cpp Session.cpp -Observer.cpp -Descriptor.cpp UserAccountMapper.cpp -PluginFacade.cpp Admin.h -Discovery.h +Descriptor.h Exception.h FileParser.h Locator.h +Observer.h +PluginFacade.h Query.h Registry.h Session.h -Observer.h -Descriptor.h UserAccountMapper.h -PluginFacade.h diff --git a/cpp/src/IceLocatorDiscovery/.gitignore b/cpp/src/IceLocatorDiscovery/.gitignore index fb1f34c05a4..45e29d8dd2d 100644 --- a/cpp/src/IceLocatorDiscovery/.gitignore +++ b/cpp/src/IceLocatorDiscovery/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend IceLocatorDiscovery.cpp IceLocatorDiscovery.h diff --git a/cpp/src/IcePatch2/.gitignore b/cpp/src/IcePatch2/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/IcePatch2/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/IcePatch2Lib/.gitignore b/cpp/src/IcePatch2Lib/.gitignore index 1364efc1d87..a6ba57e6121 100644 --- a/cpp/src/IcePatch2Lib/.gitignore +++ b/cpp/src/IcePatch2Lib/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend FileInfo.cpp FileServer.cpp FileInfo.h diff --git a/cpp/src/IceSSL/.gitignore b/cpp/src/IceSSL/.gitignore index 88e034bad9d..981999c07ba 100644 --- a/cpp/src/IceSSL/.gitignore +++ b/cpp/src/IceSSL/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! -EndpointInfo.cpp +.depend +.depend ConnectionInfo.cpp -EndpointInfo.h +EndpointInfo.cpp ConnectionInfo.h +EndpointInfo.h diff --git a/cpp/src/IceStorm/.gitignore b/cpp/src/IceStorm/.gitignore index 4fad7b4af9d..9acac8d9ebe 100644 --- a/cpp/src/IceStorm/.gitignore +++ b/cpp/src/IceStorm/.gitignore @@ -1,17 +1,20 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! -DBTypes.h -DBTypes.cpp -Instrumentation.cpp +.depend +.depend Election.cpp IceStormInternal.cpp +Instrumentation.cpp +LinkRecord.cpp LLURecord.cpp SubscriberRecord.cpp LinkRecord.cpp Instrumentation.h Election.h IceStormInternal.h +Instrumentation.h +LinkRecord.h LLURecord.h SubscriberRecord.h LinkRecord.h diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp index 2c661b4531c..d6d29630fa5 100644 --- a/cpp/src/IceStorm/IceStormDB.cpp +++ b/cpp/src/IceStorm/IceStormDB.cpp @@ -152,8 +152,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - StringSeq files = IcePatch2Internal::readDirectory(dbPath); - if(!files.empty()) + if(!IceUtilInternal::isEmptyDirectory(dbPath)) { cerr << argv[0] << ": output directory is not empty: " << dbPath << endl; return EXIT_FAILURE; diff --git a/cpp/src/IceStormLib/.gitignore b/cpp/src/IceStormLib/.gitignore index 4ac7fbb48ef..798077a2149 100644 --- a/cpp/src/IceStormLib/.gitignore +++ b/cpp/src/IceStormLib/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend IceStorm.cpp Metrics.cpp IceStorm.h diff --git a/cpp/src/IceUtil/.gitignore b/cpp/src/IceUtil/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/IceUtil/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp index ea7fc606e65..4e3dc407804 100644 --- a/cpp/src/IceUtil/FileUtil.cpp +++ b/cpp/src/IceUtil/FileUtil.cpp @@ -17,8 +17,12 @@ #ifdef _WIN32 # include <process.h> # include <io.h> +# ifndef ICE_OS_WINRT +# include <Shlwapi.h> +# endif #else # include <unistd.h> +# include <dirent.h> #endif using namespace std; @@ -90,6 +94,41 @@ IceUtilInternal::directoryExists(const string& path) } // +// Determine if a directory exists and is empty. +// +#ifndef ICE_OS_WINRT +bool +IceUtilInternal::isEmptyDirectory(const string& path) +{ +# ifdef _WIN32 + return PathIsDirectoryEmptyW(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str()); +# else + struct dirent* d; + DIR* dir = opendir(path.c_str()); + if(dir) + { + bool empty = true; + while((d = readdir(dir))) + { + string name(d->d_name); + if(name != "." && name != "..") + { + empty = false; + break; + } + } + closedir(dir); + return empty; + } + else + { + return false; + } +# endif +} +#endif + +// // Determine if a regular file exists. // bool diff --git a/cpp/src/IceXML/.gitignore b/cpp/src/IceXML/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/IceXML/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/Slice/.gitignore b/cpp/src/Slice/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/Slice/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 23b95898317..d471f3448e5 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -165,7 +165,27 @@ private: void collectClassMembers(const ClassDefPtr&, MemberInfoList&, bool); void collectExceptionMembers(const ExceptionPtr&, MemberInfoList&, bool); - string editComment(const string&); + typedef vector<string> StringVec; + + StringVec stripMarkup(const string&); + + void writeDocstring(const string&, const string& = ""); + void writeDocstring(const string&, const DataMemberList&); + void writeDocstring(const string&, const EnumeratorList&); + + typedef map<string, string> StringMap; + struct OpComment + { + StringVec description; + StringMap params; + string returns; + StringMap exceptions; + }; + bool parseOpComment(const string&, OpComment&); + + enum DocstringMode { DocSync, DocAsyncBegin, DocAsyncEnd, DocDispatch, DocAsyncDispatch }; + + void writeDocstring(const OperationPtr&, DocstringMode, bool); Output& _out; set<string>& _moduleHistory; @@ -352,11 +372,7 @@ Slice::Python::CodeVisitor::visitModuleStart(const ModulePtr& p) } _out << nl << "__name__ = '" << abs << "'"; - string comment = p->comment(); - if(!comment.empty()) - { - _out << nl << "_M_" << abs << ".__doc__ = '''" << editComment(comment) << "'''"; - } + writeDocstring(p->comment(), "_M_" + abs + ".__doc__ = "); _moduleStack.push_front(abs); return true; @@ -449,11 +465,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out.inc(); - string comment = p->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } + writeDocstring(p->comment(), p->dataMembers()); // // __init__ @@ -582,11 +594,9 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << "):"; _out.inc(); - comment = (*oli)->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } + + writeDocstring(*oli, DocAsyncDispatch, false); + _out << nl << "pass"; _out.dec(); } @@ -609,11 +619,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << "):"; _out.inc(); - comment = (*oli)->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } + writeDocstring(*oli, DocDispatch, p->isLocal()); _out << nl << "pass"; _out.dec(); } @@ -680,17 +686,8 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } } - comment = (*oli)->comment(); - if(!comment.empty()) - { - comment = "'''" + editComment(comment) + "'''"; - } - _out << sp; - if(!comment.empty()) - { - _out << nl << comment; - } + writeDocstring(*oli, DocSync, false); _out << nl << "def " << fixedOpName << "(self"; if(!inParams.empty()) { @@ -710,10 +707,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) // Async operations. // _out << sp; - if(!comment.empty()) - { - _out << nl << comment; - } + writeDocstring(*oli, DocAsyncBegin, false); _out << nl << "def begin_" << (*oli)->name() << "(self"; if(!inParams.empty()) { @@ -730,10 +724,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out.dec(); _out << sp; - if(!comment.empty()) - { - _out << nl << comment; - } + writeDocstring(*oli, DocAsyncEnd, false); _out << nl << "def end_" << (*oli)->name() << "(self, _r):"; _out.inc(); _out << nl << "return _M_" << abs << "._op_" << (*oli)->name() << ".end(self, _r)"; @@ -1032,14 +1023,10 @@ Slice::Python::CodeVisitor::visitExceptionStart(const ExceptionPtr& p) _out << "):"; _out.inc(); - string comment = p->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } - DataMemberList members = p->dataMembers(); + writeDocstring(p->comment(), members); + // // __init__ // @@ -1160,10 +1147,10 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p) string scoped = p->scoped(); string abs = getAbsolute(p); string name = fixIdent(p->name()); + DataMemberList members = p->dataMembers(); MemberInfoList memberList; { - DataMemberList members = p->dataMembers(); for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) { memberList.push_back(MemberInfo()); @@ -1179,11 +1166,7 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p) _out << nl << "class " << name << "(object):"; _out.inc(); - string comment = p->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } + writeDocstring(p->comment(), members); _out << nl << "def __init__(self"; writeConstructorParams(memberList); @@ -1513,11 +1496,7 @@ Slice::Python::CodeVisitor::visitEnum(const EnumPtr& p) _out << nl << "class " << name << "(Ice.EnumBase):"; _out.inc(); - string comment = p->comment(); - if(!comment.empty()) - { - _out << nl << "'''" << editComment(comment) << "'''"; - } + writeDocstring(p->comment(), enums); _out << sp << nl << "def __init__(self, _n, _v):"; _out.inc(); @@ -2136,25 +2115,25 @@ Slice::Python::CodeVisitor::collectExceptionMembers(const ExceptionPtr& p, Membe } } -string -Slice::Python::CodeVisitor::editComment(const string& comment) +Slice::Python::CodeVisitor::StringVec +Slice::Python::CodeVisitor::stripMarkup(const string& comment) { // // Strip HTML markup and javadoc links. // - string result = comment; + string text = comment; string::size_type pos = 0; do { - pos = result.find('<', pos); + pos = text.find('<', pos); if(pos != string::npos) { - string::size_type endpos = result.find('>', pos); + string::size_type endpos = text.find('>', pos); if(endpos == string::npos) { break; } - result.erase(pos, endpos - pos + 1); + text.erase(pos, endpos - pos + 1); } } while(pos != string::npos); @@ -2162,18 +2141,18 @@ Slice::Python::CodeVisitor::editComment(const string& comment) pos = 0; do { - pos = result.find(link, pos); + pos = text.find(link, pos); if(pos != string::npos) { - result.erase(pos, link.size()); - string::size_type endpos = result.find('}', pos); + text.erase(pos, link.size()); + string::size_type endpos = text.find('}', pos); if(endpos != string::npos) { - string::size_type identpos = result.find_first_not_of(" \t#", pos); + string::size_type identpos = text.find_first_not_of(" \t#", pos); if(identpos != string::npos && identpos < endpos) { - string ident = result.substr(identpos, endpos - identpos); - result.replace(pos, endpos - pos + 1, fixIdent(ident)); + string ident = text.substr(identpos, endpos - identpos); + text.replace(pos, endpos - pos + 1, fixIdent(ident)); } } } @@ -2190,160 +2169,639 @@ Slice::Python::CodeVisitor::editComment(const string& comment) // Look for the next @ and delete up to that, or // to the end of the string, if not found. // - pos = result.find(seeTag, pos); + pos = text.find(seeTag, pos); if(pos != string::npos) { - string::size_type next = result.find('@', pos + seeTag.size()); + string::size_type next = text.find('@', pos + seeTag.size()); if(next != string::npos) { - result.erase(pos, next - pos); + text.erase(pos, next - pos); } else { - result.erase(pos, string::npos); + text.erase(pos, string::npos); } } } while(pos != string::npos); // - // Reformat @param, @return, and @throws. + // Escape triple quotes. // - static const string paramTag = "@param"; + static const string singleQuotes = "'''"; pos = 0; - bool first = true; - do + while((pos = text.find(singleQuotes, pos)) != string::npos) { - pos = result.find(paramTag, pos); - if(pos != string::npos) + text.insert(pos, "\\"); + pos += singleQuotes.size() + 1; + } + static const string doubleQuotes = "\"\"\""; + pos = 0; + while((pos = text.find(doubleQuotes, pos)) != string::npos) + { + text.insert(pos, "\\"); + pos += doubleQuotes.size() + 1; + } + + // + // Fold multiple empty lines. + // + pos = 0; + while(true) + { + pos = text.find('\n', pos); + if(pos == string::npos) + { + break; + } + + // + // Skip the next LF or CR/LF, if present. + // + if(pos < text.size() - 1 && text[pos + 1] == '\n') + { + pos += 2; + } + else if(pos < text.size() - 2 && text[pos + 1] == '\r' && text[pos + 2] == '\n') + { + pos += 3; + } + else + { + ++pos; + continue; + } + + // + // Erase any more CR/LF characters. + // + string::size_type next = text.find_first_not_of("\r\n", pos); + if(next != string::npos) + { + text.erase(pos, next - pos); + } + } + + // + // Remove trailing whitespace. + // + pos = text.find_last_not_of(" \t\r\n"); + if(pos != string::npos) + { + text.erase(pos + 1, text.size() - pos - 1); + } + + // + // Split text into lines. + // + StringVec lines; + if(!text.empty()) + { + string::size_type start = 0; + while(start != string::npos) { - result.replace(pos, paramTag.size() + 1, " "); + string::size_type nl = text.find_first_of("\r\n", start); + string line; + if(nl != string::npos) + { + line = text.substr(start, nl - start); + start = nl; + } + else + { + line = text.substr(start); + start = text.size(); + } + + lines.push_back(line); + + start = text.find_first_not_of("\r\n", start); + } + } - if(first) + return lines; +} + +void +Slice::Python::CodeVisitor::writeDocstring(const string& comment, const string& prefix) +{ + StringVec lines = stripMarkup(comment); + if(lines.empty()) + { + return; + } + + _out << nl << prefix << "\"\"\""; + + for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q) + { + if(q != lines.begin()) + { + _out << nl; + } + _out << *q; + } + + _out << "\"\"\""; +} + +void +Slice::Python::CodeVisitor::writeDocstring(const string& comment, const DataMemberList& members) +{ + StringVec lines = stripMarkup(comment); + if(lines.empty()) + { + return; + } + + _out << nl << "\"\"\""; + + for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q) + { + if(q != lines.begin()) + { + _out << nl; + } + _out << *q; + } + + if(!members.empty()) + { + // + // Collect docstrings (if any) for the members. + // + map<string, StringVec> docs; + for(DataMemberList::const_iterator m = members.begin(); m != members.end(); ++m) + { + StringVec doc = stripMarkup((*m)->comment()); + if(!doc.empty()) { - string::size_type bol = result.rfind('\n', pos); - if(bol == string::npos) - { - bol = 0; - } - else + docs[(*m)->name()] = doc; + } + } + // + // Only emit members if there's a docstring for at least one member. + // + if(!docs.empty()) + { + _out << nl << "Members:"; + for(DataMemberList::const_iterator m = members.begin(); m != members.end(); ++m) + { + _out << nl << fixIdent((*m)->name()) << " -- "; + map<string, StringVec>::iterator p = docs.find((*m)->name()); + if(p != docs.end()) { - bol++; + for(StringVec::const_iterator q = p->second.begin(); q != p->second.end(); ++q) + { + if(q != p->second.begin()) + { + _out << nl; + } + _out << *q; + } } - result.insert(bol, "Arguments:\n"); - first = false; } } - } while(pos != string::npos); + } - static const string returnTag = "@return"; - pos = result.find(returnTag); - first = true; - if(pos != string::npos) + _out << "\"\"\""; +} + +void +Slice::Python::CodeVisitor::writeDocstring(const string& comment, const EnumeratorList& enums) +{ + StringVec lines = stripMarkup(comment); + if(lines.empty()) { - result.replace(pos, returnTag.size() + 1, " "); - string::size_type bol = result.rfind('\n', pos); - if(bol == string::npos) + return; + } + + _out << nl << "\"\"\""; + + for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q) + { + if(q != lines.begin()) { - bol = 0; + _out << nl; } - else + _out << *q; + } + + if(!enums.empty()) + { + // + // Collect docstrings (if any) for the enumerators. + // + map<string, StringVec> docs; + for(EnumeratorList::const_iterator e = enums.begin(); e != enums.end(); ++e) { - bol++; + StringVec doc = stripMarkup((*e)->comment()); + if(!doc.empty()) + { + docs[(*e)->name()] = doc; + } + } + // + // Only emit enumerators if there's a docstring for at least one enumerator. + // + if(!docs.empty()) + { + _out << nl << "Enumerators:"; + for(EnumeratorList::const_iterator e = enums.begin(); e != enums.end(); ++e) + { + _out << nl << fixIdent((*e)->name()) << " -- "; + map<string, StringVec>::iterator p = docs.find((*e)->name()); + if(p != docs.end()) + { + for(StringVec::const_iterator q = p->second.begin(); q != p->second.end(); ++q) + { + if(q != p->second.begin()) + { + _out << nl; + } + _out << *q; + } + } + } } - result.insert(bol, "Returns:\n"); } - static const string throwsTag = "@throws"; - pos = 0; - first = true; - do + _out << "\"\"\""; +} + +bool +Slice::Python::CodeVisitor::parseOpComment(const string& comment, OpComment& c) +{ + // + // Remove most javadoc & HTML markup. + // + StringVec lines = stripMarkup(comment); + if(lines.empty()) { - pos = result.find(throwsTag, pos); - if(pos != string::npos) - { - result.replace(pos, throwsTag.size() + 1, " "); + return false; + } + + // + // Extract the descriptions of parameters, exceptions and return values. + // + string name; + bool inParam = false, inException = false, inReturn = false; + vector<string>::size_type i = 0; + while(i < lines.size()) + { + string l = lines[i]; + string::size_type paramTag = l.find("@param"); + string::size_type throwTag = l.find("@throw"); + string::size_type returnTag = l.find("@return"); - if(first) + if(paramTag != string::npos) + { + string::size_type pos = l.find_first_of(" \t", paramTag); + if(pos != string::npos) + { + pos = l.find_first_not_of(" \t", pos); + } + if(pos != string::npos) { - string::size_type bol = result.rfind('\n', pos); - if(bol == string::npos) + string::size_type namePos = pos; + pos = l.find_first_of(" \t", pos); + inParam = true; + inException = false; + inReturn = false; + if(pos == string::npos) { - bol = 0; + // + // Doc assumed to have the format + // + // @param foo + // Description of foo... + // + name = l.substr(namePos); + c.params[name] = ""; } else { - bol++; + name = l.substr(namePos, pos - namePos); + pos = l.find_first_not_of(" \t", pos); + if(pos != string::npos) + { + c.params[name] = l.substr(pos); + } + else + { + c.params[name] = ""; + } + } + } + lines.erase(lines.begin() + i); + continue; + } + else if(throwTag != string::npos) + { + string::size_type pos = l.find_first_of(" \t", throwTag); + if(pos != string::npos) + { + pos = l.find_first_not_of(" \t", pos); + } + if(pos != string::npos) + { + string::size_type namePos = pos; + pos = l.find_first_of(" \t", pos); + inException = true; + inParam = false; + inReturn = false; + if(pos == string::npos) + { + // + // Doc assumed to have the format + // + // @throw foo + // Description of foo... + // + name = l.substr(namePos); + c.exceptions[name] = ""; + } + else + { + name = l.substr(namePos, pos - namePos); + pos = l.find_first_not_of(" \t", pos); + if(pos != string::npos) + { + c.exceptions[name] = l.substr(pos); + } + else + { + c.exceptions[name] = ""; + } + } + } + lines.erase(lines.begin() + i); + continue; + } + else if(returnTag != string::npos) + { + string::size_type pos = l.find_first_of(" \t", returnTag); + if(pos != string::npos) + { + pos = l.find_first_not_of(" \t", pos); + } + if(pos != string::npos) + { + inReturn = true; + inException = false; + inParam = false; + c.returns = l.substr(pos); + } + lines.erase(lines.begin() + i); + continue; + } + else + { + // + // We didn't find a tag so we assume this line is a continuation of a + // previous description. + // + string::size_type pos = l.find_first_not_of(" \t"); + if(pos != string::npos && l[pos] != '@') + { + if(inParam) + { + assert(!name.empty()); + if(!c.params[name].empty()) + { + c.params[name] += " "; + } + c.params[name] += l.substr(pos); + lines.erase(lines.begin() + i); + continue; + } + else if(inException) + { + assert(!name.empty()); + if(!c.exceptions[name].empty()) + { + c.exceptions[name] += " "; + } + c.exceptions[name] += l.substr(pos); + lines.erase(lines.begin() + i); + continue; + } + else if(inReturn) + { + if(!c.returns.empty()) + { + c.returns += " "; + } + c.returns += l.substr(pos); + lines.erase(lines.begin() + i); + continue; } - result.insert(bol, "Exceptions:\n"); - first = false; } } - } while(pos != string::npos); + + i++; + } // - // Escape triple quotes. + // All remaining lines become the general description. // - static const string quotes = "'''"; - pos = 0; - do + for(vector<string>::iterator p = lines.begin(); p != lines.end(); ++p) { - pos = result.find(quotes, pos); - if(pos != string::npos) + if(p->find_first_not_of(" \t\n\r") != string::npos) { - result.insert(pos, "\\"); - pos += quotes.size() + 1; + c.description.push_back(*p); } - } while(pos != string::npos); + } + + return true; +} + +void +Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode mode, bool local) +{ + OpComment comment; + if(!parseOpComment(op->comment(), comment)) + { + return; + } + + TypePtr ret = op->returnType(); + ParamDeclList params = op->parameters(); + vector<string> inParams, outParams; + for(ParamDeclList::iterator p = params.begin(); p != params.end(); ++p) + { + if((*p)->isOutParam()) + { + outParams.push_back((*p)->name()); + } + else + { + inParams.push_back((*p)->name()); + } + } + + if(comment.description.empty()) + { + if((mode == DocSync || mode == DocDispatch) && comment.params.empty() && comment.exceptions.empty() && + comment.returns.empty()) + { + return; + } + else if(mode == DocAsyncBegin && inParams.empty()) + { + return; + } + else if(mode == DocAsyncEnd && outParams.empty() && comment.returns.empty()) + { + return; + } + else if(mode == DocAsyncDispatch && inParams.empty() && comment.exceptions.empty()) + { + return; + } + } // - // Fold multiple empty lines. + // Emit the general description. // - pos = 0; - while(true) + _out << nl << "\"\"\""; + if(!comment.description.empty()) { - pos = result.find('\n', pos); - if(pos == string::npos) + for(StringVec::const_iterator q = comment.description.begin(); q != comment.description.end(); ++q) { - break; + if(q != comment.description.begin()) + { + _out << nl; + } + _out << *q; } + } - // - // Skip the next LF or CR/LF, if present. - // - if(pos < result.size() - 1 && result[pos + 1] == '\n') + // + // Emit arguments. + // + bool needArgs = false; + switch(mode) + { + case DocSync: + case DocAsyncBegin: + case DocDispatch: + needArgs = !local || !inParams.empty(); + break; + case DocAsyncEnd: + case DocAsyncDispatch: + needArgs = true; + break; + } + + if(needArgs) + { + _out << nl << "Arguments:"; + if(mode == DocAsyncDispatch) { - pos += 2; + _out << nl << "_cb -- The asynchronous callback object."; } - else if(pos < result.size() - 2 && result[pos + 1] == '\r' && result[pos + 2] == '\n') + for(vector<string>::iterator q = inParams.begin(); q != inParams.end(); ++q) { - pos += 3; + string fixed = fixIdent(*q); + _out << nl << fixed << " -- "; + StringMap::const_iterator r = comment.params.find(*q); + if(r == comment.params.end()) + { + r = comment.params.find(fixed); // Just in case. + } + if(r != comment.params.end()) + { + _out << r->second; + } } - else + if(mode == DocAsyncBegin) { - ++pos; - continue; + _out << nl << "_response -- The asynchronous response callback." + << nl << "_ex -- The asynchronous exception callback." + << nl << "_sent -- The asynchronous sent callback."; } - - // - // Erase any more CR/LF characters. - // - string::size_type next = result.find_first_not_of("\r\n", pos); - if(next != string::npos) + if(!local && (mode == DocSync || mode == DocAsyncBegin)) + { + _out << nl << "_ctx -- The request context for the invocation."; + } + if(!local && (mode == DocDispatch || mode == DocAsyncDispatch)) { - result.erase(pos, next - pos); + _out << nl << "current -- The Current object for the invocation."; } } + else if(mode == DocAsyncEnd) + { + _out << nl << "Arguments:" + << nl << "_r - The asynchronous result object for the invocation."; + } // - // Remove trailing whitespace. + // Emit return value(s). // - pos = result.find_last_not_of(" \t\r\n"); - if(pos != string::npos) + if(mode == DocAsyncBegin) { - result.erase(pos + 1, result.size() - pos - 1); + _out << nl << "Returns: An asynchronous result object for the invocation."; } - return result; + if((mode == DocSync || mode == DocAsyncEnd || mode == DocDispatch) && (ret || !outParams.empty())) + { + if((outParams.size() + (ret ? 1 : 0)) > 1) + { + _out << nl << "Returns a tuple containing the following:"; + if(ret) + { + _out << nl << "_retval -- " << comment.returns; + } + for(vector<string>::iterator q = outParams.begin(); q != outParams.end(); ++q) + { + string fixed = fixIdent(*q); + _out << nl << fixed << " -- "; + StringMap::const_iterator r = comment.params.find(*q); + if(r == comment.params.end()) + { + r = comment.params.find(fixed); // Just in case. + } + if(r != comment.params.end()) + { + _out << r->second; + } + } + } + else if(ret && !comment.returns.empty()) + { + _out << nl << "Returns: " << comment.returns; + } + else if(!outParams.empty()) + { + assert(outParams.size() == 1); + _out << nl << "Returns:"; + string fixed = fixIdent(outParams[0]); + _out << nl << fixed << " -- "; + StringMap::const_iterator r = comment.params.find(outParams[0]); + if(r == comment.params.end()) + { + r = comment.params.find(fixed); // Just in case. + } + if(r != comment.params.end()) + { + _out << r->second; + } + } + } + + // + // Emit exceptions. + // + if((mode == DocSync || mode == DocAsyncEnd || mode == DocDispatch || mode == DocAsyncDispatch) && + !comment.exceptions.empty()) + { + _out << nl << "Throws:"; + for(StringMap::const_iterator r = comment.exceptions.begin(); r != comment.exceptions.end(); ++r) + { + _out << nl << r->first << " -- " << r->second; + } + } + _out << "\"\"\""; } void diff --git a/cpp/src/slice2confluence/.gitignore b/cpp/src/slice2confluence/.gitignore new file mode 100644 index 00000000000..3a412ca89c7 --- /dev/null +++ b/cpp/src/slice2confluence/.gitignore @@ -0,0 +1,4 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend diff --git a/cpp/src/slice2cpp/.gitignore b/cpp/src/slice2cpp/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2cpp/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2cs/.gitignore b/cpp/src/slice2cs/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2cs/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2freeze/.gitignore b/cpp/src/slice2freeze/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2freeze/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2freezej/.gitignore b/cpp/src/slice2freezej/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2freezej/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2html/.gitignore b/cpp/src/slice2html/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2html/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2java/.gitignore b/cpp/src/slice2java/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2java/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2js/.gitignore b/cpp/src/slice2js/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2js/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2objc/.gitignore b/cpp/src/slice2objc/.gitignore new file mode 100644 index 00000000000..3a412ca89c7 --- /dev/null +++ b/cpp/src/slice2objc/.gitignore @@ -0,0 +1,4 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend diff --git a/cpp/src/slice2php/.gitignore b/cpp/src/slice2php/.gitignore new file mode 100644 index 00000000000..720f44c7047 --- /dev/null +++ b/cpp/src/slice2php/.gitignore @@ -0,0 +1,5 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend +.depend diff --git a/cpp/src/slice2py/.gitignore b/cpp/src/slice2py/.gitignore new file mode 100644 index 00000000000..3a412ca89c7 --- /dev/null +++ b/cpp/src/slice2py/.gitignore @@ -0,0 +1,4 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend diff --git a/cpp/test/Glacier2/attack/.gitignore b/cpp/test/Glacier2/attack/.gitignore index 9f1b6cf6e03..a0c8f4f0ab1 100644 --- a/cpp/test/Glacier2/attack/.gitignore +++ b/cpp/test/Glacier2/attack/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Backend.cpp Backend.h diff --git a/cpp/test/Glacier2/dynamicFiltering/.gitignore b/cpp/test/Glacier2/dynamicFiltering/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Glacier2/dynamicFiltering/.gitignore +++ b/cpp/test/Glacier2/dynamicFiltering/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Glacier2/override/.gitignore b/cpp/test/Glacier2/override/.gitignore index 1cb01a674d1..64d5c068c33 100644 --- a/cpp/test/Glacier2/override/.gitignore +++ b/cpp/test/Glacier2/override/.gitignore @@ -3,5 +3,6 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server +.depend Callback.cpp Callback.h diff --git a/cpp/test/Glacier2/router/.gitignore b/cpp/test/Glacier2/router/.gitignore index 1cb01a674d1..8671f03d5a1 100644 --- a/cpp/test/Glacier2/router/.gitignore +++ b/cpp/test/Glacier2/router/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Callback.cpp Callback.h diff --git a/cpp/test/Glacier2/sessionControl/.gitignore b/cpp/test/Glacier2/sessionControl/.gitignore index 2fa6de831ef..88130e8077a 100644 --- a/cpp/test/Glacier2/sessionControl/.gitignore +++ b/cpp/test/Glacier2/sessionControl/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Session.cpp Session.h diff --git a/cpp/test/Glacier2/sessionHelper/.gitignore b/cpp/test/Glacier2/sessionHelper/.gitignore index 1cb01a674d1..8671f03d5a1 100644 --- a/cpp/test/Glacier2/sessionHelper/.gitignore +++ b/cpp/test/Glacier2/sessionHelper/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Callback.cpp Callback.h diff --git a/cpp/test/Glacier2/ssl/.gitignore b/cpp/test/Glacier2/ssl/.gitignore index 30e8bfc4624..bc1dd55fba1 100644 --- a/cpp/test/Glacier2/ssl/.gitignore +++ b/cpp/test/Glacier2/ssl/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend diff --git a/cpp/test/Glacier2/staticFiltering/.gitignore b/cpp/test/Glacier2/staticFiltering/.gitignore index 4e792685e9d..6257255fb0a 100644 --- a/cpp/test/Glacier2/staticFiltering/.gitignore +++ b/cpp/test/Glacier2/staticFiltering/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Backend.cpp Backend.h attack.cfg diff --git a/cpp/test/Ice/acm/.gitignore b/cpp/test/Ice/acm/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/acm/.gitignore +++ b/cpp/test/Ice/acm/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/adapterDeactivation/.gitignore b/cpp/test/Ice/adapterDeactivation/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/adapterDeactivation/.gitignore +++ b/cpp/test/Ice/adapterDeactivation/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/admin/.gitignore b/cpp/test/Ice/admin/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/admin/.gitignore +++ b/cpp/test/Ice/admin/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/ami/.gitignore b/cpp/test/Ice/ami/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/ami/.gitignore +++ b/cpp/test/Ice/ami/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/background/.gitignore b/cpp/test/Ice/background/.gitignore index 3b65bea68f8..2c327f510eb 100644 --- a/cpp/test/Ice/background/.gitignore +++ b/cpp/test/Ice/background/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server libTestTransport.* +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/binding/.gitignore b/cpp/test/Ice/binding/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/binding/.gitignore +++ b/cpp/test/Ice/binding/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/checksum/.gitignore b/cpp/test/Ice/checksum/.gitignore index 74de20d2bc0..4e9331c8cda 100644 --- a/cpp/test/Ice/checksum/.gitignore +++ b/cpp/test/Ice/checksum/.gitignore @@ -1,6 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client ClientTypes.cpp ClientTypes.h diff --git a/cpp/test/Ice/custom/.gitignore b/cpp/test/Ice/custom/.gitignore index 27da0899433..554110014d7 100644 --- a/cpp/test/Ice/custom/.gitignore +++ b/cpp/test/Ice/custom/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Wstring.cpp diff --git a/cpp/test/Ice/defaultServant/.gitignore b/cpp/test/Ice/defaultServant/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/defaultServant/.gitignore +++ b/cpp/test/Ice/defaultServant/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/defaultValue/.gitignore b/cpp/test/Ice/defaultValue/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/defaultValue/.gitignore +++ b/cpp/test/Ice/defaultValue/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/dispatcher/.gitignore b/cpp/test/Ice/dispatcher/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/dispatcher/.gitignore +++ b/cpp/test/Ice/dispatcher/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/echo/.gitignore b/cpp/test/Ice/echo/.gitignore index 208c208d34b..571c54bbb1f 100644 --- a/cpp/test/Ice/echo/.gitignore +++ b/cpp/test/Ice/echo/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/enums/.gitignore b/cpp/test/Ice/enums/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/enums/.gitignore +++ b/cpp/test/Ice/enums/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/exceptions/.gitignore b/cpp/test/Ice/exceptions/.gitignore index 86dc0d62846..725fdbfe47e 100644 --- a/cpp/test/Ice/exceptions/.gitignore +++ b/cpp/test/Ice/exceptions/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Test.h diff --git a/cpp/test/Ice/facets/.gitignore b/cpp/test/Ice/facets/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/facets/.gitignore +++ b/cpp/test/Ice/facets/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/faultTolerance/.gitignore b/cpp/test/Ice/faultTolerance/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/faultTolerance/.gitignore +++ b/cpp/test/Ice/faultTolerance/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/gc/.gitignore b/cpp/test/Ice/gc/.gitignore index 4270746d238..dcdf5eb23c7 100644 --- a/cpp/test/Ice/gc/.gitignore +++ b/cpp/test/Ice/gc/.gitignore @@ -1,7 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h -seed diff --git a/cpp/test/Ice/hash/.gitignore b/cpp/test/Ice/hash/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/hash/.gitignore +++ b/cpp/test/Ice/hash/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/hold/.gitignore b/cpp/test/Ice/hold/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/hold/.gitignore +++ b/cpp/test/Ice/hold/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/info/.gitignore b/cpp/test/Ice/info/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/info/.gitignore +++ b/cpp/test/Ice/info/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/inheritance/.gitignore b/cpp/test/Ice/inheritance/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/inheritance/.gitignore +++ b/cpp/test/Ice/inheritance/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/interceptor/.gitignore b/cpp/test/Ice/interceptor/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/interceptor/.gitignore +++ b/cpp/test/Ice/interceptor/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/invoke/.gitignore b/cpp/test/Ice/invoke/.gitignore index 67872faa673..2ec67c2a17c 100644 --- a/cpp/test/Ice/invoke/.gitignore +++ b/cpp/test/Ice/invoke/.gitignore @@ -3,5 +3,6 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/location/.gitignore b/cpp/test/Ice/location/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/location/.gitignore +++ b/cpp/test/Ice/location/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/logger/.gitignore b/cpp/test/Ice/logger/.gitignore index a3840a0dcdf..a918a882f43 100644 --- a/cpp/test/Ice/logger/.gitignore +++ b/cpp/test/Ice/logger/.gitignore @@ -1,8 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client1 client2 client3 client4 -seed +.depend diff --git a/cpp/test/Ice/metrics/.gitignore b/cpp/test/Ice/metrics/.gitignore index 86dc0d62846..725fdbfe47e 100644 --- a/cpp/test/Ice/metrics/.gitignore +++ b/cpp/test/Ice/metrics/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Test.h diff --git a/cpp/test/Ice/networkProxy/.gitignore b/cpp/test/Ice/networkProxy/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/networkProxy/.gitignore +++ b/cpp/test/Ice/networkProxy/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/objects/.gitignore b/cpp/test/Ice/objects/.gitignore index 5d899411377..786b3556d1c 100644 --- a/cpp/test/Ice/objects/.gitignore +++ b/cpp/test/Ice/objects/.gitignore @@ -1,10 +1,14 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp +Derived.cpp +DerivedEx.cpp Test.h Derived.cpp Derived.h diff --git a/cpp/test/Ice/operations/.gitignore b/cpp/test/Ice/operations/.gitignore index 86dc0d62846..725fdbfe47e 100644 --- a/cpp/test/Ice/operations/.gitignore +++ b/cpp/test/Ice/operations/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Test.h diff --git a/cpp/test/Ice/optional/.gitignore b/cpp/test/Ice/optional/.gitignore index f6ac51a4607..f1f62485ccb 100644 --- a/cpp/test/Ice/optional/.gitignore +++ b/cpp/test/Ice/optional/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd +.depend Test.cpp -Test.h TestAMD.cpp +Test.h TestAMD.h diff --git a/cpp/test/Ice/plugin/.gitignore b/cpp/test/Ice/plugin/.gitignore index 2b0c67f9d75..acda1ecf37a 100644 --- a/cpp/test/Ice/plugin/.gitignore +++ b/cpp/test/Ice/plugin/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client plugins/libTestPlugin.* +.depend diff --git a/cpp/test/Ice/properties/.gitignore b/cpp/test/Ice/properties/.gitignore index 9f5181ae1f1..f715a76859d 100644 --- a/cpp/test/Ice/properties/.gitignore +++ b/cpp/test/Ice/properties/.gitignore @@ -1,5 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client -seed +.depend diff --git a/cpp/test/Ice/proxy/.gitignore b/cpp/test/Ice/proxy/.gitignore index 86dc0d62846..725fdbfe47e 100644 --- a/cpp/test/Ice/proxy/.gitignore +++ b/cpp/test/Ice/proxy/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Test.h diff --git a/cpp/test/Ice/retry/.gitignore b/cpp/test/Ice/retry/.gitignore index d00d2864558..21c2eee2b29 100644 --- a/cpp/test/Ice/retry/.gitignore +++ b/cpp/test/Ice/retry/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server collocated +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/servantLocator/.gitignore b/cpp/test/Ice/servantLocator/.gitignore index 86dc0d62846..725fdbfe47e 100644 --- a/cpp/test/Ice/servantLocator/.gitignore +++ b/cpp/test/Ice/servantLocator/.gitignore @@ -1,10 +1,12 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd collocated +.depend Test.cpp TestAMD.cpp Test.h diff --git a/cpp/test/Ice/services/.gitignore b/cpp/test/Ice/services/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/services/.gitignore +++ b/cpp/test/Ice/services/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/slicing/exceptions/.gitignore b/cpp/test/Ice/slicing/exceptions/.gitignore index ed8bb406a1e..756a3f6161a 100644 --- a/cpp/test/Ice/slicing/exceptions/.gitignore +++ b/cpp/test/Ice/slicing/exceptions/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd +.depend Test.cpp TestAMD.cpp ClientPrivate.cpp diff --git a/cpp/test/Ice/slicing/objects/.gitignore b/cpp/test/Ice/slicing/objects/.gitignore index cea91f33071..899ee01ff92 100644 --- a/cpp/test/Ice/slicing/objects/.gitignore +++ b/cpp/test/Ice/slicing/objects/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server serveramd +.depend Test.cpp TestAMD.cpp ClientPrivate.cpp diff --git a/cpp/test/Ice/stream/.gitignore b/cpp/test/Ice/stream/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Ice/stream/.gitignore +++ b/cpp/test/Ice/stream/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/stringConverter/.gitignore b/cpp/test/Ice/stringConverter/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/stringConverter/.gitignore +++ b/cpp/test/Ice/stringConverter/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/threadPoolPriority/.gitignore b/cpp/test/Ice/threadPoolPriority/.gitignore index a5ba5646b8e..ae1078237e7 100644 --- a/cpp/test/Ice/threadPoolPriority/.gitignore +++ b/cpp/test/Ice/threadPoolPriority/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server servercustom +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/timeout/.gitignore b/cpp/test/Ice/timeout/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/timeout/.gitignore +++ b/cpp/test/Ice/timeout/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/Ice/udp/.gitignore b/cpp/test/Ice/udp/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/Ice/udp/.gitignore +++ b/cpp/test/Ice/udp/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/IceBox/admin/.gitignore b/cpp/test/IceBox/admin/.gitignore index 881ee03f814..03484b5178b 100644 --- a/cpp/test/IceBox/admin/.gitignore +++ b/cpp/test/IceBox/admin/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client libTestService.* +.depend Test.cpp Test.h diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore index 881ee03f814..03484b5178b 100644 --- a/cpp/test/IceBox/configuration/.gitignore +++ b/cpp/test/IceBox/configuration/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client libTestService.* +.depend Test.cpp Test.h diff --git a/cpp/test/IceDiscovery/simple/.gitignore b/cpp/test/IceDiscovery/simple/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/IceDiscovery/simple/.gitignore +++ b/cpp/test/IceDiscovery/simple/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/IceGrid/activation/.gitignore b/cpp/test/IceGrid/activation/.gitignore index 6236c515c56..1593c12731f 100644 --- a/cpp/test/IceGrid/activation/.gitignore +++ b/cpp/test/IceGrid/activation/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/admin/.gitignore b/cpp/test/IceGrid/admin/.gitignore index 43b93111bf8..6d52720534e 100644 --- a/cpp/test/IceGrid/admin/.gitignore +++ b/cpp/test/IceGrid/admin/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend server +.depend db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/allocation/.gitignore b/cpp/test/IceGrid/allocation/.gitignore index 819e86ad169..b38ad0a165c 100644 --- a/cpp/test/IceGrid/allocation/.gitignore +++ b/cpp/test/IceGrid/allocation/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server verifier +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/deployer/.gitignore b/cpp/test/IceGrid/deployer/.gitignore index 7f02284cfee..acaef95b2cd 100644 --- a/cpp/test/IceGrid/deployer/.gitignore +++ b/cpp/test/IceGrid/deployer/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server libTestService.* +.depend Test.cpp Test.h build.txt diff --git a/cpp/test/IceGrid/distribution/.gitignore b/cpp/test/IceGrid/distribution/.gitignore index 43222375494..77c4fb4d540 100644 --- a/cpp/test/IceGrid/distribution/.gitignore +++ b/cpp/test/IceGrid/distribution/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/noRestartUpdate/.gitignore b/cpp/test/IceGrid/noRestartUpdate/.gitignore index d12de56b4ca..1a26f311e2a 100644 --- a/cpp/test/IceGrid/noRestartUpdate/.gitignore +++ b/cpp/test/IceGrid/noRestartUpdate/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server libTestService.* +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore index 6c64605ce39..18519db5234 100644 --- a/cpp/test/IceGrid/replicaGroup/.gitignore +++ b/cpp/test/IceGrid/replicaGroup/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server libTestService.* +.depend Test.cpp Test.h build.txt diff --git a/cpp/test/IceGrid/replication/.gitignore b/cpp/test/IceGrid/replication/.gitignore index 06dd9d3bfba..a2fb0ecc07c 100644 --- a/cpp/test/IceGrid/replication/.gitignore +++ b/cpp/test/IceGrid/replication/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h build.txt diff --git a/cpp/test/IceGrid/session/.gitignore b/cpp/test/IceGrid/session/.gitignore index 41397371fa5..c975494fe1e 100644 --- a/cpp/test/IceGrid/session/.gitignore +++ b/cpp/test/IceGrid/session/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server verifier +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/simple/.gitignore b/cpp/test/IceGrid/simple/.gitignore index 6236c515c56..1593c12731f 100644 --- a/cpp/test/IceGrid/simple/.gitignore +++ b/cpp/test/IceGrid/simple/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceGrid/update/.gitignore b/cpp/test/IceGrid/update/.gitignore index 43222375494..77c4fb4d540 100644 --- a/cpp/test/IceGrid/update/.gitignore +++ b/cpp/test/IceGrid/update/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h db/node diff --git a/cpp/test/IceSSL/configuration/.gitignore b/cpp/test/IceSSL/configuration/.gitignore index 67872faa673..3a3aae35bd8 100644 --- a/cpp/test/IceSSL/configuration/.gitignore +++ b/cpp/test/IceSSL/configuration/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client server +.depend Test.cpp Test.h diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 6b937c0c229..667341af8c1 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1355,8 +1355,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b } catch(const LocalException& ex) { + // + // OpenSSL < 1.0 doesn't support tls 1.1 so it will also fail, we ignore in this + // case. + // +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L cerr << ex << endl; test(false); +#endif } fact->destroyServer(server); comm->destroy(); diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore index f6811ab9123..9f3e354edb6 100644 --- a/cpp/test/IceStorm/federation/.gitignore +++ b/cpp/test/IceStorm/federation/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore index 1e15a552882..1ee63744e74 100644 --- a/cpp/test/IceStorm/federation2/.gitignore +++ b/cpp/test/IceStorm/federation2/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt diff --git a/cpp/test/IceStorm/rep1/.gitignore b/cpp/test/IceStorm/rep1/.gitignore index a6eaee14920..9cd9b7ec547 100644 --- a/cpp/test/IceStorm/rep1/.gitignore +++ b/cpp/test/IceStorm/rep1/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber sub +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/repgrid/.gitignore b/cpp/test/IceStorm/repgrid/.gitignore index 34ee77907e3..6c0d77be0e0 100644 --- a/cpp/test/IceStorm/repgrid/.gitignore +++ b/cpp/test/IceStorm/repgrid/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/repstress/.gitignore b/cpp/test/IceStorm/repstress/.gitignore index 3326cff4756..c1e2c6ba18a 100644 --- a/cpp/test/IceStorm/repstress/.gitignore +++ b/cpp/test/IceStorm/repstress/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber control +.depend Single.cpp Controller.cpp Single.h diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore index 9d7c0709185..7245563774f 100644 --- a/cpp/test/IceStorm/single/.gitignore +++ b/cpp/test/IceStorm/single/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore index 1e15a552882..1ee63744e74 100644 --- a/cpp/test/IceStorm/stress/.gitignore +++ b/cpp/test/IceStorm/stress/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt diff --git a/cpp/test/IceUtil/condvar/.gitignore b/cpp/test/IceUtil/condvar/.gitignore index 9feff7712b2..4498983a9de 100644 --- a/cpp/test/IceUtil/condvar/.gitignore +++ b/cpp/test/IceUtil/condvar/.gitignore @@ -1,5 +1,7 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend workqueue match +.depend diff --git a/cpp/test/IceUtil/ctrlCHandler/.gitignore b/cpp/test/IceUtil/ctrlCHandler/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/ctrlCHandler/.gitignore +++ b/cpp/test/IceUtil/ctrlCHandler/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/inputUtil/.gitignore b/cpp/test/IceUtil/inputUtil/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/inputUtil/.gitignore +++ b/cpp/test/IceUtil/inputUtil/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/priority/.gitignore b/cpp/test/IceUtil/priority/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/priority/.gitignore +++ b/cpp/test/IceUtil/priority/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/sha1/.gitignore b/cpp/test/IceUtil/sha1/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/sha1/.gitignore +++ b/cpp/test/IceUtil/sha1/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/stacktrace/.gitignore b/cpp/test/IceUtil/stacktrace/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/stacktrace/.gitignore +++ b/cpp/test/IceUtil/stacktrace/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/thread/.gitignore b/cpp/test/IceUtil/thread/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/thread/.gitignore +++ b/cpp/test/IceUtil/thread/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/timer/.gitignore b/cpp/test/IceUtil/timer/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/timer/.gitignore +++ b/cpp/test/IceUtil/timer/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/unicode/.gitignore b/cpp/test/IceUtil/unicode/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/unicode/.gitignore +++ b/cpp/test/IceUtil/unicode/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/IceUtil/uuid/.gitignore b/cpp/test/IceUtil/uuid/.gitignore index 1446b6586f5..f715a76859d 100644 --- a/cpp/test/IceUtil/uuid/.gitignore +++ b/cpp/test/IceUtil/uuid/.gitignore @@ -1,4 +1,6 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend diff --git a/cpp/test/Slice/keyword/.gitignore b/cpp/test/Slice/keyword/.gitignore index 0e03bd06e7e..b6ac5c9979a 100644 --- a/cpp/test/Slice/keyword/.gitignore +++ b/cpp/test/Slice/keyword/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Key.cpp Key.h diff --git a/cpp/test/Slice/macros/.gitignore b/cpp/test/Slice/macros/.gitignore index 505a9066685..dcdf5eb23c7 100644 --- a/cpp/test/Slice/macros/.gitignore +++ b/cpp/test/Slice/macros/.gitignore @@ -1,6 +1,8 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Test.h diff --git a/cpp/test/Slice/parser/.gitignore b/cpp/test/Slice/parser/.gitignore index 7732d7c018e..9fb83203e46 100644 --- a/cpp/test/Slice/parser/.gitignore +++ b/cpp/test/Slice/parser/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend CircularA.o CircularB.o +.depend CircularA.cpp CircularB.cpp CircularA.h diff --git a/cpp/test/Slice/structure/.gitignore b/cpp/test/Slice/structure/.gitignore index aec891a666e..c837849dc6b 100644 --- a/cpp/test/Slice/structure/.gitignore +++ b/cpp/test/Slice/structure/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Test.cpp Forward.cpp Test.h diff --git a/cpp/test/Slice/utf8BOM/.gitignore b/cpp/test/Slice/utf8BOM/.gitignore index 067afe32e86..446425aa735 100644 --- a/cpp/test/Slice/utf8BOM/.gitignore +++ b/cpp/test/Slice/utf8BOM/.gitignore @@ -2,5 +2,6 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! Test.o +.depend Test.cpp Test.h diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index c89be8cdda4..a27633dbf67 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -20,7 +20,7 @@ buildscript { } } dependencies { - classpath group: 'com.zeroc.gradle.ice-builder', name: 'slice', version: '1.2.0' + classpath group: 'com.zeroc.gradle.ice-builder', name: 'slice', version: '1.2.1' } } diff --git a/js/test/Ice/promise/Client.js b/js/test/Ice/promise/Client.js index dc25f3e7eb4..f64c1a454bf 100644 --- a/js/test/Ice/promise/Client.js +++ b/js/test/Ice/promise/Client.js @@ -826,12 +826,12 @@ var p = new Promise(); var start = Date.now(); - p = p.succeed(10).delay(500).then( function(i) { test(i == 10); - test(Date.now() - start >= 450 && Date.now() - start <= 650); + test(Date.now() - start >= 450); + test(Date.now() - start <= 900); } ).then( function() @@ -841,7 +841,8 @@ function(i) { test(i == 10); - test(Date.now() - start >= 450 && Date.now() - start <= 650); + test(Date.now() - start >= 450); + test(Date.now() - start <= 900); } ) } @@ -858,7 +859,8 @@ function(ex) { test(ex == "failed"); - test(Date.now() - start >= 450 && Date.now() - start <= 650); + test(Date.now() - start >= 450); + test(Date.now() - start <= 900); out.writeLine("ok"); promise.succeed(); } diff --git a/php/test/Ice/acm/Client.php b/php/test/Ice/acm/Client.php index b559a9d7d1d..6a0a63dfa52 100644 --- a/php/test/Ice/acm/Client.php +++ b/php/test/Ice/acm/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/binding/Client.php b/php/test/Ice/binding/Client.php index 13bd6cc6677..3b3c376f033 100644 --- a/php/test/Ice/binding/Client.php +++ b/php/test/Ice/binding/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } @@ -187,7 +188,7 @@ function allTests($communicator) // $com->deactivateObjectAdapter($adapters[2]); $test = createTestIntfPrx($adapters); - test($test->getAdapterName() == "Adapter12"); + test($test->getAdapterName() == "Adapter12"); deactivate($com, $adapters); } @@ -280,7 +281,7 @@ function allTests($communicator) // // Now, re-activate the adapters with the same endpoints in the opposite // order. - // + // $adapters[] = $com->createObjectAdapter("Adapter36", $endpoints[2]->toString()); for($i = 0; $i < $nRetry && $test->getAdapterName() == "Adapter36"; $i++); test($i == $nRetry); @@ -419,7 +420,7 @@ function allTests($communicator) // // Now, re-activate the adapters with the same endpoints in the opposite // order. - // + // $adapters[] = $com->createObjectAdapter("Adapter66", $endpoints[2]->toString()); for($i = 0; $i < $nRetry && $test->getAdapterName() == "Adapter66"; $i++); test($i == $nRetry); diff --git a/php/test/Ice/checksum/Client.php b/php/test/Ice/checksum/Client.php index a84685f44ca..a14cbe4da01 100644 --- a/php/test/Ice/checksum/Client.php +++ b/php/test/Ice/checksum/Client.php @@ -26,7 +26,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/defaultValue/Client.php b/php/test/Ice/defaultValue/Client.php index caf06d93d70..2fcc596ce0f 100644 --- a/php/test/Ice/defaultValue/Client.php +++ b/php/test/Ice/defaultValue/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } @@ -54,7 +55,7 @@ function allTests() test($v->l == 4); test($v->f == 5.1); test($v->d == 6.2); - test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\b? \007 \007"); + test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\010? \007 \007"); test($v->c1 == $red); test($v->c2 == $green); test($v->c3 == $blue); @@ -104,7 +105,7 @@ function allTests() test($v->l == 4); test($v->f == 5.1); test($v->d == 6.2); - test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\b? \007 \007"); + test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\010? \007 \007"); test(strlen($v->noDefault) == 0); test($v->zeroI == 0); test($v->zeroL == 0); @@ -124,7 +125,7 @@ function allTests() test($v->l == 4); test($v->f == 5.1); test($v->d == 6.2); - test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\b? \007 \007"); + test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\010? \007 \007"); test(strlen($v->noDefault) == 0); test($v->c1 == $red); test($v->c2 == $green); @@ -150,7 +151,7 @@ function allTests() test($v->l == 4); test($v->f == 5.1); test($v->d == 6.2); - test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\b? \007 \007"); + test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\010? \007 \007"); test(strlen($v->noDefault) == 0); test($v->zeroI == 0); test($v->zeroL == 0); @@ -170,7 +171,7 @@ function allTests() test($v->l == 4); test($v->f == 5.1); test($v->d == 6.2); - test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\b? \007 \007"); + test($v->str == "foo \\ \"bar\n \r\n\t\013\f\007\010? \007 \007"); test(strlen($v->noDefault) == 0); test($v->c1 == $red); test($v->c2 == $green); diff --git a/php/test/Ice/enums/Client.php b/php/test/Ice/enums/Client.php index c61c9c04c48..4ce07324735 100644 --- a/php/test/Ice/enums/Client.php +++ b/php/test/Ice/enums/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index 0d9feaf9da9..cfc27d988ad 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/facets/Client.php b/php/test/Ice/facets/Client.php index 32dc94e573e..d4a8d306ee5 100644 --- a/php/test/Ice/facets/Client.php +++ b/php/test/Ice/facets/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/info/Client.php b/php/test/Ice/info/Client.php index 3378395ee9d..64632cbd616 100644 --- a/php/test/Ice/info/Client.php +++ b/php/test/Ice/info/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php index 33c82f8bb6b..50a544c2752 100644 --- a/php/test/Ice/inheritance/Client.php +++ b/php/test/Ice/inheritance/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/ini/Client.php b/php/test/Ice/ini/Client.php index 47eade542b2..1594ae0a188 100644 --- a/php/test/Ice/ini/Client.php +++ b/php/test/Ice/ini/Client.php @@ -21,7 +21,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/ini/ClientWithProfile.php b/php/test/Ice/ini/ClientWithProfile.php index f7f3a4f21ee..ba4909e639e 100644 --- a/php/test/Ice/ini/ClientWithProfile.php +++ b/php/test/Ice/ini/ClientWithProfile.php @@ -21,7 +21,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index 542413d4a6c..a63a0bad7ae 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -181,7 +181,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php index da449507589..b5426df1ef8 100644 --- a/php/test/Ice/operations/Client.php +++ b/php/test/Ice/operations/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } @@ -41,8 +42,8 @@ function twoways($communicator, $p) $myDerivedClass = $NS ? "Test\\MyDerivedClass" : "Test_MyDerivedClass"; $myClass = $NS ? "Test\\MyClass" : "Test_MyClass"; $objectPrxHelper = $NS ? "Ice\\ObjectPrxHelper" : "Ice_ObjectPrxHelper"; - - + + $s0 = $NS ? constant("Test\\s0") : constant("Test_s0"); $s1 = $NS ? constant("Test\\s1") : constant("Test_s1"); $s2 = $NS ? constant("Test\\s2") : constant("Test_s2"); @@ -54,7 +55,7 @@ function twoways($communicator, $p) $s8 = $NS ? constant("Test\\s8") : constant("Test_s8"); $s9 = $NS ? constant("Test\\s9") : constant("Test_s9"); $s10 = $NS ? constant("Test\\s10") : constant("Test_s10"); - + $sw0 = $NS ? constant("Test\\sw0") : constant("Test_sw0"); $sw1 = $NS ? constant("Test\\sw1") : constant("Test_sw1"); $sw2 = $NS ? constant("Test\\sw2") : constant("Test_sw2"); @@ -81,7 +82,7 @@ function twoways($communicator, $p) { $literals = $p->opStringLiterals(); - test($s0 == "\\" && + test($s0 == "\\" && $s0 == $sw0 && $s0 == $literals[0] && $s0 == $literals[11]); @@ -95,8 +96,8 @@ function twoways($communicator, $p) $s2 == $sw2 && $s2 == $literals[2] && $s2 == $literals[13]); - - test($s3 == "A21" && + + test($s3 == "A21" && $s3 == $sw3 && $s3 == $literals[3] && $s3 == $literals[14]); @@ -110,22 +111,22 @@ function twoways($communicator, $p) $s5 == $sw5 && $s5 == $literals[5] && $s5 == $literals[16]); - + test($s6 == "\xcf\xbf" && $s6 == $sw6 && $s6 == $literals[6] && $s6 == $literals[17]); - + test($s7 == "\xd7\xb0" && $s7 == $sw7 && $s7 == $literals[7] && $s7 == $literals[18]); - + test($s8 == "\xf0\x90\x80\x80" && $s8 == $sw8 && $s8 == $literals[8] && $s8 == $literals[19]); - + test($s9 == "\xf0\x9f\x8d\x8c" && $s9 == $sw9 && $s9 == $literals[9] && @@ -135,23 +136,23 @@ function twoways($communicator, $p) $s10 == $sw10 && $s10 == $literals[10] && $s10 == $literals[21]); - + test($ss0 == "'\"?\\\007\010\f\n\r\t\v" && $ss0 == $ss1 && $ss1 == $ss2 && $ss0 == $literals[22] && $ss0 == $literals[23] && $ss0 == $literals[24]); - + test($ss3 == "\\\\U\\u\\" && $ss3 == $literals[25]); - + test($ss4 == "\\A\\" && $ss4 == $literals[26]); - + test($ss5 == "\\u0041\\" && $ss5 == $literals[27]); - + test($su0 == $su1 && $su0 == $su2 && $su0 == $literals[28] && diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php index 636e25c6240..85afef6f086 100644 --- a/php/test/Ice/optional/Client.php +++ b/php/test/Ice/optional/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } @@ -337,12 +338,12 @@ function allTests($communicator) test($oo != Ice_Unset); $initial->ice_encodingVersion($Ice_Encoding_1_0)->returnOptionalClass(true, $oo); test($oo == Ice_Unset); - - + + $gcls = $NS ? "Test\\G" : "Test_G"; $g1cls = $NS ? "Test\\G1" : "Test_G1"; $g2cls = $NS ? "Test\\G2" : "Test_G2"; - + $g = new $gcls; $g->gg1Opt = new $g1cls("gg1Opt"); $g->gg2 = new $g2cls(10); diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php index 441078b1127..a80838fb44f 100644 --- a/php/test/Ice/proxy/Client.php +++ b/php/test/Ice/proxy/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } @@ -38,7 +39,7 @@ function allTests($communicator) $random = $NS ? constant("Ice\\EndpointSelectionType::Random") : constant("Ice_EndpointSelectionType::Random"); $ordered = $NS ? constant("Ice\\EndpointSelectionType::Ordered") : constant("Ice_EndpointSelectionType::Ordered"); $encodingVersion = $NS ? "Ice\\EncodingVersion" : "Ice_EncodingVersion"; - + $identityToString = $NS ? "Ice\\identityToString" : "Ice_identityToString"; $stringToIdentity = $NS ? "Ice\\stringToIdentity" : "Ice_stringToIdentity"; @@ -490,7 +491,7 @@ function allTests($communicator) { $cl20->ice_ping(); test(false); - } + } catch(Exception $ex) { // Server 2.0 endpoint doesn't support 1.1 version. @@ -685,7 +686,7 @@ function allTests($communicator) $p1 = $communicator->stringToProxy("test -e 1.1:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); $pstr = $communicator->proxyToString($p1); test($pstr == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"); - + // Opaque endpoint encoded with 1.1 encoding. $p2 = $communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); test($communicator->proxyToString($p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"); diff --git a/php/test/Ice/slicing/exceptions/Client.php b/php/test/Ice/slicing/exceptions/Client.php index fc818c09d99..db410f4366a 100644 --- a/php/test/Ice/slicing/exceptions/Client.php +++ b/php/test/Ice/slicing/exceptions/Client.php @@ -16,7 +16,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Ice/slicing/objects/Client.php b/php/test/Ice/slicing/objects/Client.php index 94f38ef6c67..8baf6c96c80 100644 --- a/php/test/Ice/slicing/objects/Client.php +++ b/php/test/Ice/slicing/objects/Client.php @@ -17,7 +17,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Slice/keyword/Client.php b/php/test/Slice/keyword/Client.php index 54075d97017..84da5378948 100644 --- a/php/test/Slice/keyword/Client.php +++ b/php/test/Slice/keyword/Client.php @@ -34,7 +34,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Slice/macros/Client.php b/php/test/Slice/macros/Client.php index b38126cb198..a8e16923446 100644 --- a/php/test/Slice/macros/Client.php +++ b/php/test/Slice/macros/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/php/test/Slice/structure/Client.php b/php/test/Slice/structure/Client.php index 1efe1b19817..03cb6476c8b 100644 --- a/php/test/Slice/structure/Client.php +++ b/php/test/Slice/structure/Client.php @@ -25,7 +25,8 @@ function test($b) if(!$b) { $bt = debug_backtrace(); - die("\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"); + echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n"; + exit(1); } } diff --git a/ruby/test/Ice/operations/Twoways.rb b/ruby/test/Ice/operations/Twoways.rb index 3ef8588ac55..e8a70e7e1a5 100644 --- a/ruby/test/Ice/operations/Twoways.rb +++ b/ruby/test/Ice/operations/Twoways.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 # ********************************************************************** # # Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. @@ -12,75 +13,75 @@ def twoways(communicator, p) literals = p.opStringLiterals(); - test(Test::S0 == "\\".force_encoding("utf-8") && + test(Test::S0 == "\\" && Test::S0 == Test::Sw0 && Test::S0 == literals[0] && Test::S0 == literals[11]); - test(Test::S1 == "A".force_encoding("utf-8") && + test(Test::S1 == "A" && Test::S1 == Test::Sw1 && Test::S1 == literals[1] && Test::S1 == literals[12]); - test(Test::S2 == "Ice".force_encoding("utf-8") && + test(Test::S2 == "Ice" && Test::S2 == Test::Sw2 && Test::S2 == literals[2] && Test::S2 == literals[13]); - test(Test::S3 == "A21".force_encoding("utf-8") && + test(Test::S3 == "A21" && Test::S3 == Test::Sw3 && Test::S3 == literals[3] && Test::S3 == literals[14]); - test(Test::S4 == "\\u0041 \\U00000041".force_encoding("utf-8") && + test(Test::S4 == "\\u0041 \\U00000041" && Test::S4 == Test::Sw4 && Test::S4 == literals[4] && Test::S4 == literals[15]); - test(Test::S5 == "\xc3\xbf".force_encoding("utf-8") && + test(Test::S5 == "\xc3\xbf" && Test::S5 == Test::Sw5 && Test::S5 == literals[5] && Test::S5 == literals[16]); - test(Test::S6 == "\xcf\xbf".force_encoding("utf-8") && + test(Test::S6 == "\xcf\xbf" && Test::S6 == Test::Sw6 && Test::S6 == literals[6] && Test::S6 == literals[17]); - test(Test::S7 == "\xd7\xb0".force_encoding("utf-8") && + test(Test::S7 == "\xd7\xb0" && Test::S7 == Test::Sw7 && Test::S7 == literals[7] && Test::S7 == literals[18]); - test(Test::S8 == "\xf0\x90\x80\x80".force_encoding("utf-8") && + test(Test::S8 == "\xf0\x90\x80\x80" && Test::S8 == Test::Sw8 && Test::S8 == literals[8] && Test::S8 == literals[19]); - test(Test::S9 == "\xf0\x9f\x8d\x8c".force_encoding("utf-8") && + test(Test::S9 == "\xf0\x9f\x8d\x8c" && Test::S9 == Test::Sw9 && Test::S9 == literals[9] && Test::S9 == literals[20]); - test(Test::S10 == "\xe0\xb6\xa7".force_encoding("utf-8") && + test(Test::S10 == "\xe0\xb6\xa7" && Test::S10 == Test::Sw10 && Test::S10 == literals[10] && Test::S10 == literals[21]); - test(Test::Ss0 == "\'\"\x3f\\\a\b\f\n\r\t\v".force_encoding("utf-8") && + test(Test::Ss0 == "\'\"\x3f\\\a\b\f\n\r\t\v" && Test::Ss0 == Test::Ss1 && Test::Ss0 == Test::Ss2 && Test::Ss0 == literals[22] && Test::Ss0 == literals[23] && Test::Ss0 == literals[24]); - test(Test::Ss3 == "\\\\U\\u\\".force_encoding("utf-8") && + test(Test::Ss3 == "\\\\U\\u\\" && Test::Ss3 == literals[25]); - test(Test::Ss4 == "\\A\\".force_encoding("utf-8") && + test(Test::Ss4 == "\\A\\" && Test::Ss4 == literals[26]); - test(Test::Ss5 == "\\u0041\\".force_encoding("utf-8") && + test(Test::Ss5 == "\\u0041\\" && Test::Ss5 == literals[27]); test(Test::Su0 == Test::Su1 && |