aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
authorMichael Gmelin <grembo@FreeBSD.org>2015-12-27 17:40:15 +0000
committerMichael Gmelin <grembo@FreeBSD.org>2015-12-27 17:40:15 +0000
commitee955dc4f8a9df0b1f005631a7eaa747d361e466 (patch)
treeffef14dad47251519a39a6d1b19c418777340f56 /devel/ice/files
parentd05e4290c025e181f76dd8663ab283f9b35e909c (diff)
downloadports-ee955dc4f8a9df0b1f005631a7eaa747d361e466.tar.gz
ports-ee955dc4f8a9df0b1f005631a7eaa747d361e466.zip
Update ice ports to 3.6.1 and switch to new unit test framework.
Approved by: mentors (implicit)
Notes
Notes: svn path=/head/; revision=404582
Diffstat (limited to 'devel/ice/files')
-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
-rw-r--r--devel/ice/files/patch-cpp-test-Ice-properties-run.py11
-rw-r--r--devel/ice/files/patch-python-test-Ice-properties-run.py11
-rw-r--r--devel/ice/files/patch-scripts-TestUtil.py12
5 files changed, 28 insertions, 207 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
deleted file mode 100644
index f87e447108ff..000000000000
--- a/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
---- 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__ << " (" << time(0) << ")" << endl;
- Ice::Context ctx;
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- ctx["serverOvrd"] = "test";
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- for(int i = 0; i < 5; i++)
- {
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, i, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, i, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, i, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackOK(1, i) < 3);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- }
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(twowayR, 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackOK(1, 0) == 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- int count = 0;
- int nRetry = 0;
- do
- {
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->hold();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(onewayR, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(twowayR, 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200 + nRetry * 200));
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->activate();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackOK(1, 0) == 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- count = callbackReceiverImpl->callbackWithPayloadOK(0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->callbackWithPayloadOK(count);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- }
- while(count == 10 && nRetry++ < 10);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(count < 10);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->hold();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1000));
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->activate();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackWithPayloadOK(4) == 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- int remainingCallbacks = callbackReceiverImpl->callbackOK(1, 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << 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__ << " (" << time(0) << ")" << endl;
- if(remainingCallbacks > 0)
- {
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackOK(remainingCallbacks, 0) == 0);
- }
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- ctx["_fwd"] = "O";
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->hold();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallback(onewayR, 0, ctx);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- oneway->initiateCallbackWithPayload(twowayR);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200));
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- callbackReceiverImpl->activate();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackWithPayloadOK(3) == 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(callbackReceiverImpl->callbackOK(1, 0) == 0);
-+ cout << __LINE__ << " (" << time(0) << ")" << 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
deleted file mode 100644
index abe3c64508dd..000000000000
--- a/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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__ << " (" << time(0) << ")" << endl;
- while(value < 3000 && cond->value())
- {
-+ if (!value)
-+ cout << __LINE__ << " (" << time(0) << ")" << 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__ << " (" << time(0) << ")" << endl;
- ++value;
- if(value % 100 == 0)
- {
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- result->waitForSent();
- }
- }
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- result->waitForCompleted();
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- test(cond->value());
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
-
- for(int i = 0; i < 10000; ++i)
- {
-+ if (value == 3000)
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- holdSerialized->ice_oneway()->setOneway(value + 1, value);
-+ if (value == 3000)
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- ++value;
- if((i % 100) == 0)
- {
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- holdSerialized->ice_oneway()->putOnHold(1);
- }
- }
-+ cout << __LINE__ << " (" << time(0) << ")" << endl;
- }
- cout << "ok" << endl;
-
diff --git a/devel/ice/files/patch-cpp-test-Ice-properties-run.py b/devel/ice/files/patch-cpp-test-Ice-properties-run.py
new file mode 100644
index 000000000000..b99503f630b5
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Ice-properties-run.py
@@ -0,0 +1,11 @@
+--- cpp/test/Ice/properties/run.py.orig 2015-12-27 03:21:09.629772970 +0100
++++ cpp/test/Ice/properties/run.py 2015-12-27 03:21:20.836761970 +0100
+@@ -28,7 +28,7 @@
+ #
+ if sys.version_info[0] == 2:
+ configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
+- decodedPath = configPath.decode("utf-8")
++ decodedPath = configPath
+ else:
+ configPath = "./config/\u4e2d\u56fd_client.config"
+ decodedPath = configPath # No need to decode with Python3, strings are already Unicode
diff --git a/devel/ice/files/patch-python-test-Ice-properties-run.py b/devel/ice/files/patch-python-test-Ice-properties-run.py
new file mode 100644
index 000000000000..da98dc879c6f
--- /dev/null
+++ b/devel/ice/files/patch-python-test-Ice-properties-run.py
@@ -0,0 +1,11 @@
+--- python/test/Ice/properties/run.py.orig 2015-12-27 02:42:11.742927971 +0100
++++ python/test/Ice/properties/run.py 2015-12-27 03:06:41.640921970 +0100
+@@ -26,7 +26,7 @@
+ #
+ if sys.version_info[0] == 2:
+ configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
+- decodedPath = configPath.decode("utf-8")
++ decodedPath = configPath
+ else:
+ configPath = "./config/\u4e2d\u56fd_client.config"
+ decodedPath = configPath # No need to decode with Python3, strings are already Unicode
diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py
index bd301767de25..e014e83c7af5 100644
--- a/devel/ice/files/patch-scripts-TestUtil.py
+++ b/devel/ice/files/patch-scripts-TestUtil.py
@@ -26,15 +26,15 @@
def getCppCompiler():
compiler = ""
if os.environ.get("CPP_COMPILER", "") != "":
-@@ -311,7 +330,7 @@
- if(p.wait() != 0):
+@@ -324,7 +324,7 @@
print("uname failed:\n" + p.stdout.read().strip())
sys.exit(1)
-- if p.stdout.readline().decode('UTF-8').strip() == "x86_64" and os.environ.get("LP64", "") != "no":
-+ if p.stdout.readline().decode('UTF-8').strip() in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
+ line = p.stdout.readline().decode('UTF-8').strip()
+- if line == "x86_64" and os.environ.get("LP64", "") != "no":
++ if line in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
x64 = True
-
- #
+ elif line == "armv7l":
+ armv7l = True
@@ -1887,7 +1906,7 @@
if lang == "java":
addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll