aboutsummaryrefslogtreecommitdiff
path: root/devel/ice
diff options
context:
space:
mode:
authorMichael Gmelin <grembo@FreeBSD.org>2015-08-02 13:47:42 +0000
committerMichael Gmelin <grembo@FreeBSD.org>2015-08-02 13:47:42 +0000
commit44b3670721b9de6875173c929fa742924613f218 (patch)
treed6477dab6e82e4e47e1805dbf37d89c75c93b4bc /devel/ice
parent41eaef76845c96c39ec9764a58be1126c1bc657d (diff)
downloadports-44b3670721b9de6875173c929fa742924613f218.tar.gz
ports-44b3670721b9de6875173c929fa742924613f218.zip
Add debug output in an attempt to figure out why certain tests fail on
package builders. PR: 201743 Approved by: mentors (implicit)
Notes
Notes: svn path=/head/; revision=393423
Diffstat (limited to 'devel/ice')
-rw-r--r--devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp152
-rw-r--r--devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp49
2 files changed, 201 insertions, 0 deletions
diff --git a/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp b/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp
new file mode 100644
index 000000000000..4a6ab66a0902
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp
@@ -0,0 +1,152 @@
+--- cpp/test/Glacier2/override/Client.cpp.orig 2015-08-02 15:07:07.945090996 +0200
++++ cpp/test/Glacier2/override/Client.cpp 2015-08-02 15:08:39.753584996 +0200
+@@ -102,59 +102,105 @@
+
+ {
+ cout << "testing server request override... " << flush;
++ cout << __LINE__ << endl;
+ Ice::Context ctx;
++ cout << __LINE__ << endl;
+ ctx["serverOvrd"] = "test";
++ cout << __LINE__ << endl;
+ for(int i = 0; i < 5; i++)
+ {
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, i, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, i, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, i, ctx);
++ cout << __LINE__ << endl;
+ IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackOK(1, i) < 3);
++ cout << __LINE__ << endl;
+ }
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(twowayR, 0);
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackOK(1, 0) == 0);
++ cout << __LINE__ << endl;
+
+ int count = 0;
+ int nRetry = 0;
+ do
+ {
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->hold();
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(onewayR, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(twowayR, 0);
++ cout << __LINE__ << endl;
+ IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200 + nRetry * 200));
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->activate();
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackOK(1, 0) == 0);
++ cout << __LINE__ << endl;
+ count = callbackReceiverImpl->callbackWithPayloadOK(0);
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->callbackWithPayloadOK(count);
++ cout << __LINE__ << endl;
+ }
+ while(count == 10 && nRetry++ < 10);
++ cout << __LINE__ << endl;
+ test(count < 10);
++ cout << __LINE__ << endl;
+
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->hold();
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1000));
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->activate();
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackWithPayloadOK(4) == 0);
++ cout << __LINE__ << endl;
+
+ int remainingCallbacks = callbackReceiverImpl->callbackOK(1, 0);
++ cout << __LINE__ << endl;
+ //
+ // Occasionally, Glacier2 flushes in the middle of our 5
+ // callbacks, so we get more than 1 callback
+@@ -164,26 +210,43 @@
+ // time to receive this (these) extra callback(s).
+ //
+ test(remainingCallbacks <= 4);
++ cout << __LINE__ << endl;
+ if(remainingCallbacks > 0)
+ {
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackOK(remainingCallbacks, 0) == 0);
+ }
++ cout << __LINE__ << endl;
+
+ ctx["_fwd"] = "O";
++ cout << __LINE__ << endl;
+
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->hold();
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallback(onewayR, 0, ctx);
++ cout << __LINE__ << endl;
+ oneway->initiateCallbackWithPayload(twowayR);
++ cout << __LINE__ << endl;
+ IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200));
++ cout << __LINE__ << endl;
+ callbackReceiverImpl->activate();
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackWithPayloadOK(3) == 0);
++ cout << __LINE__ << endl;
+ test(callbackReceiverImpl->callbackOK(1, 0) == 0);
++ cout << __LINE__ << endl;
+
+ cout << "ok" << endl;
+ }
diff --git a/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp
new file mode 100644
index 000000000000..7dd89df78710
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp
@@ -0,0 +1,49 @@
+--- cpp/test/Ice/hold/AllTests.cpp.orig 2015-06-23 17:30:20.000000000 +0200
++++ cpp/test/Ice/hold/AllTests.cpp 2015-08-02 15:05:08.363617996 +0200
+@@ -152,31 +152,46 @@
+ ConditionPtr cond = new Condition(true);
+ int value = 0;
+ Ice::AsyncResultPtr result;
++ cout << __LINE__ << endl;
+ while(value < 3000 && cond->value())
+ {
++ if (!value)
++ cout << __LINE__ << endl;
+ result = holdSerialized->begin_set(value + 1,
+ IceUtilInternal::random(1),
+ newCallback_Hold_set(new SetCB(cond, value),
+ &SetCB::response,
+ &SetCB::exception));
++ if (!value)
++ cout << __LINE__ << endl;
+ ++value;
+ if(value % 100 == 0)
+ {
++ cout << __LINE__ << endl;
+ result->waitForSent();
+ }
+ }
++ cout << __LINE__ << endl;
+ result->waitForCompleted();
++ cout << __LINE__ << endl;
+ test(cond->value());
++ cout << __LINE__ << endl;
+
+ for(int i = 0; i < 10000; ++i)
+ {
++ if (value == 3000)
++ cout << __LINE__ << endl;
+ holdSerialized->ice_oneway()->setOneway(value + 1, value);
++ if (value == 3000)
++ cout << __LINE__ << endl;
+ ++value;
+ if((i % 100) == 0)
+ {
++ cout << __LINE__ << endl;
+ holdSerialized->ice_oneway()->putOnHold(1);
+ }
+ }
++ cout << __LINE__ << endl;
+ }
+ cout << "ok" << endl;
+