Page MenuHomeFreeBSD
Differential D2930 Diff 6689 devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp

Changeset View

Standalone View

View Options

devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp

--- cpp.orig/test/Ice/info/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200 --- cpp.orig/test/Ice/info/AllTests.cpp 2015-01-23 12:42:09.819774063 +0000
+++ cpp/test/Ice/info/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100 +++ cpp/test/Ice/info/AllTests.cpp 2015-01-23 12:42:59.341774435 +0000
@@ -141,9 +141,11 @@ @@ -157,7 +157,7 @@
test(info->adapterName.empty()); test(info->adapterName.empty());
test(info->localPort > 0); test(info->localPort > 0);
test(info->remotePort == 12010); test(info->remotePort == 12010);
- test(info->remoteAddress == defaultHost); - if(defaultHost == "127.0.0.1")
- test(info->localAddress == defaultHost); + if(defaultHost == "127.0.0.1" && !inFreeBSDJail())
- {
+ if (!inFreeBSDJail()) test(info->remoteAddress == defaultHost);
+ { test(info->localAddress == defaultHost);
+ test(info->remoteAddress == defaultHost); @@ -182,7 +182,7 @@
+ test(info->localAddress == defaultHost);
+ }
ostringstream os;
Ice::Context ctx = testIntf->getConnectionInfoAsContext();
@@ -163,8 +165,11 @@
test(info->adapterName.empty()); test(info->adapterName.empty());
test(info->localPort > 0); test(info->localPort > 0);
test(info->remotePort == 12010); test(info->remotePort == 12010);
- test(info->remoteAddress ==defaultHost); - if(defaultHost == "127.0.0.1")
- test(info->localAddress == defaultHost); + if(defaultHost == "127.0.0.1" && !inFreeBSDJail())
+ if (!inFreeBSDJail()) {
+ { test(info->remoteAddress == defaultHost);
+ test(info->remoteAddress == defaultHost); test(info->localAddress == defaultHost);
+ test(info->localAddress == defaultHost);
+ }
}
cout << "ok" << endl;