ports/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
Ruslan Makhmatkhanov 58e60f6909 - update to 3.5.0
- add license (GPLv2)
- switch to bdb 5
- mark broken on 10.x for the time being (as it was discussed on ports@ ML)
- remove patches, applied upstream

This version of Ice brings many new features, e.g.
- New encoding version
- Metrics facility
- Optional data members and parameters
- Compact encoding for classes and exceptions
- Compact type IDs
- Preserved slices
- Custom enumerator values
- C++11 lambda functions
- Remote Update of Server Properties
- IPv6 now enabled by default
- Python 3 support
- Use Berkley DB 5

See http://doc.zeroc.com/display/Ice/Release+Notes for details.

PR:		179233
Submitted by:	Michael Gmelin <freebsd@grem.de> (maintainer)
Tested by:  Jaret Bartsch <jaretbartsch@yahoo.ca>
2013-06-17 11:42:41 +00:00

32 lines
2.3 KiB
C++

--- cpp.orig/test/Ice/metrics/AllTests.cpp 2013-03-11 15:19:47.000000000 +0000
+++ cpp/test/Ice/metrics/AllTests.cpp 2013-05-20 02:11:00.939194168 +0000
@@ -597,9 +597,12 @@
testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
- testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
+ if (!inFreeBSDJail())
+ {
+ testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
+ testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
+ }
//testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
- testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
@@ -814,9 +817,12 @@
testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
- testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
+ if (!inFreeBSDJail())
+ {
+ testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
+ testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
+ }
testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
- testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
//testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);