diff options
author | Matthew Newhook <matthew@zeroc.com> | 2007-06-13 18:03:40 +0800 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2007-06-13 18:03:40 +0800 |
commit | 800d9fc7021b9648c1f298a1c67abc6c5536febe (patch) | |
tree | 07e6e6826e3a86705d3d98cd9f3044f9bc19297b /java/config/TestUtil.py | |
parent | Fixed typos for bug 2225. (diff) | |
download | ice-800d9fc7021b9648c1f298a1c67abc6c5536febe.tar.bz2 ice-800d9fc7021b9648c1f298a1c67abc6c5536febe.tar.xz ice-800d9fc7021b9648c1f298a1c67abc6c5536febe.zip |
Fixed bug with TestUtil.cleanDbDir and IceGridAdmin.cleanDbDir.
Added back accidently erased .gitignore files.
Added clean rules to IceGrid demo Makefiles.
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r-- | java/config/TestUtil.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index fa1ce1954fa..280d29507b8 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -531,10 +531,5 @@ def collocatedTest(): collocatedTestWithOptions("") def cleanDbDir(path): - - files = os.listdir(path) - - for filename in files: - if filename != "CVS" and filename != ".dummy": - fullpath = os.path.join(path, filename); - os.remove(fullpath) + for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"]: + os.remove(filename) |