diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2016-10-12 17:23:57 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2016-10-12 17:23:57 +0000 |
| commit | ca88d4185442d186287d9694a0b5c4c8ae793b47 (patch) | |
| tree | a868f7556ba059bce352402316515733238a5f3e /devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp | |
| parent | Fix default command (diff) | |
Update ice ports to 3.6.3
A few critical patches got merged upstream, a few new were required
to maintain LibreSSL support and fix other new issues. Note that slice2py
moved from devel/py-ice to devel/ice.
Approved by: mentors (implicit)
Notes
Notes:
svn path=/head/; revision=423875
Diffstat (limited to 'devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp')
| -rw-r--r-- | devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp index f30051f81dbc..a42d617e4145 100644 --- a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp +++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp @@ -1,5 +1,5 @@ ---- cpp/test/IceGrid/deployer/AllTests.cpp.orig 2015-07-04 13:12:57.306420997 +0200 -+++ cpp/test/IceGrid/deployer/AllTests.cpp 2015-07-04 13:13:30.146599997 +0200 +--- cpp/test/IceGrid/deployer/AllTests.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ cpp/test/IceGrid/deployer/AllTests.cpp 2016-10-11 23:09:05.053078910 +0200 @@ -126,21 +126,21 @@ // // Test with empty file. @@ -48,7 +48,7 @@ test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - + - it = session->openServerLog("LogServer", testDir + "/log2.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 1); test(it->read(1024, lines) && lines.size() == 1); @@ -64,7 +64,7 @@ @@ -195,37 +195,37 @@ // // Test with log file with one line with EOL on last line. - // + // - string path = testDir + "/log3.txt"; + string path = testDir + "/db/log3.txt"; ofstream os(path.c_str()); @@ -84,7 +84,7 @@ test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - + - it = session->openServerLog("LogServer", testDir + "/log3.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 1); test(it->read(1024, lines) && lines.size() == 2); @@ -131,7 +131,7 @@ test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - + - it = session->openServerLog("LogServer", testDir + "/log4.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 1); test(it->read(1024, lines) && lines.size() == 2); @@ -182,7 +182,7 @@ test(it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && lines[1].empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - + - it = session->openServerLog("LogServer", testDir + "/log1.txt", 2); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 2); test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0])); |