summaryrefslogtreecommitdiffstats
path: root/testing/framework
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2021-04-02 13:43:49 (GMT)
committerMats Wichmann <mats@linux.com>2021-04-14 21:32:13 (GMT)
commitb6e861cc465680f4c1ae5ec3327504da9afd5730 (patch)
tree48ff81509abb6be7270e6c45cf2286338043ace8 /testing/framework
parenta20701025fa9f7901396b7d148c5069e86e16944 (diff)
downloadSCons-b6e861cc465680f4c1ae5ec3327504da9afd5730.zip
SCons-b6e861cc465680f4c1ae5ec3327504da9afd5730.tar.gz
SCons-b6e861cc465680f4c1ae5ec3327504da9afd5730.tar.bz2
Test tweaks to help testing on mingw-only win32 systems
On a system where SCons is started from the mingw bash shell, and mingw Python is the interpreter, the secondary self-identification differs. Use that in a few tests which otherwise make the wrong decision. EnvironmentTests used an invalid value for CCFLAGS, and empty string is a better choice. Change a couple of cases where Python code was run directly so it's prefixed by the-Python-in-use, which fails if there is not a Windows-registered program for .py files - we didn't really want to use the Windows-native Python anyway. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'testing/framework')
-rw-r--r--testing/framework/TestCommon.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/framework/TestCommon.py b/testing/framework/TestCommon.py
index b1630e5..2eeaad0 100644
--- a/testing/framework/TestCommon.py
+++ b/testing/framework/TestCommon.py
@@ -785,10 +785,6 @@ class TestCommon(TestCmd):
sys.stdout.flush()
pass_skips = os.environ.get('TESTCOMMON_PASS_SKIPS')
if pass_skips in [None, 0, '0']:
- # skip=1 means skip this function when showing where this
- # result came from. They only care about the line where the
- # script called test.skip_test(), not the line number where
- # we call test.no_result().
if from_fw:
self.no_result(skip=2)
else: