From 0299d54d2dc33d12da7241f77e3bcfa9c74603fb Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Wed, 17 Oct 2012 21:11:57 +0200
Subject: [PATCH] Squish: Cleaned path maintenance in tst_build_speedcrunch
Change-Id: Ic3cb8571c79ab2880975a439d893ba794c153d7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
.../suite_general/tst_build_speedcrunch/test.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 960417b829e..b1b553eea2c 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -44,17 +44,11 @@ def main():
def init():
global SpeedCrunchPath
- SpeedCrunchPath = srcPath + "/creator-test-data/speedcrunch/src/speedcrunch.pro"
+ SpeedCrunchPath = os.path.join(srcPath, "creator-test-data", "speedcrunch", "src", "speedcrunch.pro")
cleanup()
def cleanup():
# Make sure the .user files are gone
cleanUpUserFiles(SpeedCrunchPath)
-
- BuildPath = glob.glob(srcPath + "/creator-test-data/speedcrunch/speedcrunch-build-*")
- BuildPath += glob.glob(srcPath + "/creator-test-data/speedcrunch/qtcreator-build-*")
-
- if BuildPath:
- for dir in BuildPath:
- if os.access(dir, os.F_OK):
- shutil.rmtree(dir)
+ for dir in glob.glob(os.path.join(srcPath, "creator-test-data", "speedcrunch", "speedcrunch-build-*")):
+ deleteDirIfExists(dir)
--
GitLab