summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 0a1c781..852e2e2 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 5cf58a3..176c4d3 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',