diff options
| author | Russel Winder <russel@winder.org.uk> | 2015-02-21 16:55:29 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2015-02-21 16:55:29 (GMT) |
| commit | 3c442e0a34b65c84a7efecb6c56976909ffde428 (patch) | |
| tree | a4e9d69e11dab422cb60a09b32d5312e59760c66 | |
| parent | d5937ecd5ed42b159f0cdfbe7c0e0ce0bc1a984f (diff) | |
| parent | 6a87411122374088eab75fc13c083e9e43b827fc (diff) | |
| download | SCons-3c442e0a34b65c84a7efecb6c56976909ffde428.zip SCons-3c442e0a34b65c84a7efecb6c56976909ffde428.tar.gz SCons-3c442e0a34b65c84a7efecb6c56976909ffde428.tar.bz2 | |
Commit reconciled merge.
| -rw-r--r-- | test/D/MixedDAndC/Common/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/D/MixedDAndC/Common/common.py b/test/D/MixedDAndC/Common/common.py index d78175d..6c570f1 100644 --- a/test/D/MixedDAndC/Common/common.py +++ b/test/D/MixedDAndC/Common/common.py @@ -30,7 +30,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons from os.path import abspath, dirname -from platform import machine +from platform import architecture import sys sys.path.insert(1, abspath(dirname(__file__) + '/../../Support')) @@ -48,7 +48,7 @@ def testForTool(tool): test.run() - if machine() in ('i386', 'i486', 'i586', 'i686'): + if architecture()[0] == '32bit': test.fail_test('64-bit mode not compiled in' not in test.stderr()) test.pass_test() |