diff options
Diffstat (limited to 'devel/ice/files/patch-cpp-test-Ice-properties-run.py')
| -rw-r--r-- | devel/ice/files/patch-cpp-test-Ice-properties-run.py | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/devel/ice/files/patch-cpp-test-Ice-properties-run.py b/devel/ice/files/patch-cpp-test-Ice-properties-run.py index 4959545a4df8..9537cffd0de1 100644 --- a/devel/ice/files/patch-cpp-test-Ice-properties-run.py +++ b/devel/ice/files/patch-cpp-test-Ice-properties-run.py @@ -1,18 +1,29 @@ ---- cpp.orig/test/Ice/properties/run.py 2011-06-15 21:43:59.000000000 +0200 -+++ cpp/test/Ice/properties/run.py 2012-03-04 20:14:53.000000000 +0100 -@@ -26,7 +26,7 @@ +--- cpp.orig/test/Ice/properties/run.py 2013-03-11 15:19:47.000000000 +0000 ++++ cpp/test/Ice/properties/run.py 2013-05-21 03:48:13.020195761 +0000 +@@ -28,15 +28,15 @@ # - # Write config - # --configPath = u"./config/中国_client.config" -+configPath = u"./config/中国_client.config".encode("utf-8") + if sys.version_info[0] == 2: + configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8") +- TestUtil.createConfig(configPath, ++ TestUtil.createConfig(configPath.encode("utf-8"), + ["# Automatically generated by Ice test driver.", + "Ice.Trace.Protocol=1", + "Ice.Trace.Network=1", + "Ice.ProgramName=PropertiesClient", +- "Config.Path=./config/中国_client.config"]) ++ "Config.Path=" + configPath.encode("utf-8")]) + else: + configPath = "./config/\u4e2d\u56fd_client.config" +- TestUtil.createConfig(configPath, ++ TestUtil.createConfig(configPath.encode("utf-8"), + ["# Automatically generated by Ice test driver.", + "Ice.Trace.Protocol=1", + "Ice.Trace.Network=1", +@@ -46,5 +46,5 @@ - TestUtil.createConfig(configPath, - ["# Automatically generated by Ice test driver.", -@@ -38,4 +38,4 @@ TestUtil.simpleTest(client) - if os.path.exists(configPath): +-if os.path.exists(configPath): - os.remove(configPath) -\ No newline at end of file -+ os.remove(configPath) ++if os.path.exists(configPath.encode("utf-8")): ++ os.remove(configPath.encode("utf-8")) |