summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2010-01-05 15:03:03 +0100
committerBenoit Foucher <benoit@zeroc.com>2010-01-05 15:03:03 +0100
commit2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c (patch)
treeb179b72766a60db1a2fcb362089726793b5d9655 /scripts/TestUtil.py
parentBug 4538 - update instructions for building berkeley on windows (diff)
downloadice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.tar.bz2
ice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.tar.xz
ice-2eb6a2e5c43a04bc8ea3c72dd3aadc82fa9e430c.zip
Fix for bug 4538 -- Freeze file lock is now stored in __Freeze subdirectory
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 38c3375d207..260702ffc81 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1180,6 +1180,10 @@ def collocatedTest(additionalOptions = ""):
appVerifierAfterTestEnd([exe])
def cleanDbDir(path):
+ if os.path.exists(os.path.join(path, "__Freeze", "lock")):
+ os.remove(os.path.join(path, "__Freeze", "lock"))
+ if os.path.exists(os.path.join(path, "__Freeze")):
+ os.rmdir(os.path.join(path, "__Freeze"))
for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG" ]:
os.remove(filename)