diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
commit | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch) | |
tree | 6a5171dd615dfeee62a45044144c66e864738fb0 /net-libs/serf/files | |
parent | ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff) |
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'net-libs/serf/files')
-rw-r--r-- | net-libs/serf/files/serf-1.3.9-python3-check.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/net-libs/serf/files/serf-1.3.9-python3-check.patch b/net-libs/serf/files/serf-1.3.9-python3-check.patch new file mode 100644 index 000000000000..fbbfe36fefe0 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-python3-check.patch @@ -0,0 +1,74 @@ +From 05eae144c6b3ed85f0829de6278a8f89505506f0 Mon Sep 17 00:00:00 2001 +From: Bert Huijben <rhuijben@apache.org> +Date: Mon, 2 Nov 2015 17:50:29 +0000 +Subject: [PATCH] * build/check.py Print a bit more information about the + failed test. The returncode might be interesting to track down signal + problems. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1712098 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build/check.py b/build/check.py +index fc49d336..75287016 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -55,13 +55,13 @@ + print "== Testing %s ==" % (case) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError: +- print "ERROR: test case %s failed" % (case) ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) + + print "== Running the unit tests ==" + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError: +- print "ERROR: test(s) failed in test_all" ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) +From 773a2ee2ca7a48dd8356707fa6774afcf5b85470 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Branko=20=C4=8Cibej?= <brane@apache.org> +Date: Sat, 9 Jun 2018 08:10:10 +0000 +Subject: [PATCH] Make the tests run with Python 3.x. + +* build/check.py: Add parentheses around 'print' statement arguments + so that they work when 'print' is a function. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/build/check.py b/build/check.py +index 75287016..e05760f9 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -52,16 +52,16 @@ + + # Find test responses and run them one by one + for case in glob.glob(testdir + "/testcases/*.response"): +- print "== Testing %s ==" % (case) ++ print("== Testing %s ==" % (case)) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError, x: +- print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) + +- print "== Running the unit tests ==" ++ print("== Running the unit tests ==") + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError, x: +- print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) |