summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-04-07 19:22:10 +0200
committerJose <jose@zeroc.com>2016-04-07 19:22:10 +0200
commit7a5970ada31094087fef0494cac624c5610558de (patch)
tree2a7d28544baa2468c612fd460de6f0da117c1976 /cpp/test
parentDo not throw if log rotation fails. (diff)
downloadice-7a5970ada31094087fef0494cac624c5610558de.tar.bz2
ice-7a5970ada31094087fef0494cac624c5610558de.tar.xz
ice-7a5970ada31094087fef0494cac624c5610558de.zip
Windows build fixes
Diffstat (limited to 'cpp/test')
-rwxr-xr-xcpp/test/Ice/logger/run.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/test/Ice/logger/run.py b/cpp/test/Ice/logger/run.py
index 0cc58ebc4ab..5d49ec1185a 100755
--- a/cpp/test/Ice/logger/run.py
+++ b/cpp/test/Ice/logger/run.py
@@ -72,7 +72,7 @@ if not os.path.exists("log"):
open("log/client5-4.log", 'a').close()
if TestUtil.isWin32():
- os.system("echo Y|cacls log /P %USERNAME%:R")
+ os.system("echo Y|cacls log /P %USERNAME%:R 1> nul")
else:
os.system("chmod -w log")
@@ -85,7 +85,7 @@ if ret != 0:
sys.exit(1)
if TestUtil.isWin32():
- os.system("echo Y|cacls log /P %USERNAME%:F")
+ os.system("echo Y|cacls log /P %USERNAME%:F 1> nul")
else:
os.system("chmod +w log")
@@ -116,7 +116,7 @@ for f in glob.glob("client5-2-*.log"):
if not os.stat(f).st_size == 128:
print("failed! file {0} size: {1} unexpected".format(f, os.stat(f).st_size))
sys.exit(1)
-
+
if (not os.path.isfile("client5-3.log") or
not os.stat("client5-2.log").st_size == 128 or
len(glob.glob("client5-2-*.log")) != 7):