summaryrefslogtreecommitdiffstats
path: root/QMTest
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-08-09 21:56:44 (GMT)
committerdirkbaechle <devnull@localhost>2012-08-09 21:56:44 (GMT)
commit780d9ca6577e5a15b4d4cfad111b74132c255be1 (patch)
tree5696b9fa594e2b3a56161afede1ebcd92ee5c1e0 /QMTest
parent1fea3bfcaf2ee4cbb7498426bac6b83e6c4bc1d9 (diff)
downloadSCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.zip
SCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.tar.gz
SCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.tar.bz2
- renamed the '-j' option to '-k', such that we can use the former for parallel processing later on
- changed list(map()) to list comprehensions - removed try/except block around os.environ.get() for SCONS_EXTERNAL_TEST - fixed a potential deadlock for subprocess.Popen by using temporary files - added the '--nopipefiles' option to switch off this temp file fix (not recommended though)
Diffstat (limited to 'QMTest')
-rw-r--r--QMTest/TestCmd.py6
-rw-r--r--QMTest/TestSCons.py6
2 files changed, 2 insertions, 10 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 8d382ce..8a465a0 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -897,11 +897,7 @@ class TestCmd(object):
combine = 0,
universal_newlines = 1,
timeout = None):
- self.external = 0
- try:
- self.external = os.environ.get('SCONS_EXTERNAL_TEST', 0)
- except KeyError:
- pass
+ self.external = os.environ.get('SCONS_EXTERNAL_TEST', 0)
self._cwd = os.getcwd()
self.description_set(description)
self.program_set(program)
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index e6e0c8c..86c0dec 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -231,11 +231,7 @@ class TestSCons(TestCommon):
is not necessary.
"""
self.orig_cwd = os.getcwd()
- self.external = 0
- try:
- self.external = os.environ.get('SCONS_EXTERNAL_TEST', 0)
- except KeyError:
- pass
+ self.external = os.environ.get('SCONS_EXTERNAL_TEST', 0)
if not self.external:
try: