diff options
| author | Jose <jose@zeroc.com> | 2017-02-10 21:32:43 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-02-10 21:32:43 +0100 |
| commit | 5d03298089f84b0b7624896cdb3d1eab9a3f6baa (patch) | |
| tree | f36dd253262a14d913b41bc7f90e67dc60d109f4 | |
| parent | C# implementation of setPublishedEndpoints (diff) | |
| download | ice-5d03298089f84b0b7624896cdb3d1eab9a3f6baa.tar.bz2 ice-5d03298089f84b0b7624896cdb3d1eab9a3f6baa.tar.xz ice-5d03298089f84b0b7624896cdb3d1eab9a3f6baa.zip | |
Fix java/Slice/generation test
| -rw-r--r-- | cpp/src/Slice/FileTracker.cpp | 10 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Slice/generation/list-generated.out | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index bfb253931c1..398f7e49bc4 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -136,18 +136,18 @@ void Slice::FileTracker::dumpxml() { consoleOut << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; - consoleOut << "<generated>" << endl; + consoleOut << "<generated>"; for(map<string, list<string> >::const_iterator p = _generated.begin(); p != _generated.end(); ++p) { if(!p->second.empty()) { - consoleOut << " <source name=\"" << p->first << "\">"; + consoleOut << endl << " <source name=\"" << p->first << "\">"; for(list<string>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) { - consoleOut << " <file name=\"" << *q << "\"/>" << endl; + consoleOut << endl << " <file name=\"" << *q << "\"/>"; } - consoleOut << " </source>" << endl; + consoleOut << endl << " </source>"; } } - consoleOut << "</generated>" << endl; + consoleOut << endl << "</generated>" << endl; } diff --git a/java/test/src/main/java/test/Slice/generation/list-generated.out b/java/test/src/main/java/test/Slice/generation/list-generated.out index adc47f8b79b..8d60b86fdf5 100644 --- a/java/test/src/main/java/test/Slice/generation/list-generated.out +++ b/java/test/src/main/java/test/Slice/generation/list-generated.out @@ -5,13 +5,11 @@ <file name="classes/test/Slice/generation/Test/Interface1.java"/> <file name="classes/test/Slice/generation/Test/Interface1Prx.java"/> <file name="classes/test/Slice/generation/Test/_Interface1PrxI.java"/> - <output></output> </source> <source name="File2.ice"> <file name="classes/test/Slice/generation/Test/_Marker.java"/> <file name="classes/test/Slice/generation/Test/Interface2.java"/> <file name="classes/test/Slice/generation/Test/Interface2Prx.java"/> <file name="classes/test/Slice/generation/Test/_Interface2PrxI.java"/> - <output></output> </source> </generated> |