summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-02-21 00:09:23 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2015-02-21 00:09:23 -0800
commit914ec3f2131528f45310590e50a38748791f4498 (patch)
treea4a72a197f366bbe4f629a683c58beb129cc28b5
parent6650a8f398255fe88552dad10543158677b3e1f3 (diff)
downloadscons-914ec3f2131528f45310590e50a38748791f4498.tar.gz
remove forced 64 bit compilation. This should clear up build failures. Russel mentioned there was some issue causing him to add this logic. If the issue resurfaces, then we'll see if we can handle the corner case in more general fashion
-rw-r--r--test/D/MixedDAndC/Common/common.py16
-rw-r--r--test/D/MixedDAndC/Image/SConstruct5
2 files changed, 15 insertions, 6 deletions
diff --git a/test/D/MixedDAndC/Common/common.py b/test/D/MixedDAndC/Common/common.py
index 0a1c781d..852e2e2f 100644
--- a/test/D/MixedDAndC/Common/common.py
+++ b/test/D/MixedDAndC/Common/common.py
@@ -46,11 +46,17 @@ def testForTool(tool):
test.dir_fixture('Image')
- if architecture()[0] == '32bit':
- test.run(status=2)
- test.fail_test('64-bit mode not compiled in' not in test.stderr())
- else:
- test.run()
+# There was an issue with Russel mentioned but couldn't remember the details
+# Which drove him to add the following logic. For now removing until
+# we can determine what that issue is and if there's not a better
+# way to handle the corner case
+# if architecture()[0] == '32bit':
+# test.run(status=2)
+# test.fail_test('64-bit mode not compiled in' not in test.stderr())
+# else:
+# test.run()
+
+ test.run()
test.pass_test()
diff --git a/test/D/MixedDAndC/Image/SConstruct b/test/D/MixedDAndC/Image/SConstruct
index 5cf58a39..176c4d31 100644
--- a/test/D/MixedDAndC/Image/SConstruct
+++ b/test/D/MixedDAndC/Image/SConstruct
@@ -3,7 +3,10 @@
import os
environment = Environment(
- DFLAGS=['-m64', '-O'])
+)
+# CFLAGS=['-m64'],
+# DLINKFLAGS=['-m64'],
+# DFLAGS=['-m64', '-O'])
environment.Program('proj', [
'proj.d',