Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / native_client / tests / callingconv / nacl.scons

diff --git a/src/native_client/tests/callingconv/nacl.scons b/src/native_client/tests/callingconv/nacl.scons
index 1560da7..9554b15 100644 (file)
--- a/src/native_client/tests/callingconv/nacl.scons
+++ b/src/native_client/tests/callingconv/nacl.scons
@@ -48,7 +48,7 @@ base_settings = {
   # which would force scons to always rebuild.
 }
 
-def AddTest(env, test_variant, envlist, settings, is_broken):
+def AddTest(env, test_variant, envlist, settings):
   envlist = list(envlist)
   settings = dict(settings)
   # Add custom CFLAGS: this must be done here, since PNaClGetNNaClEnv
@@ -108,8 +108,7 @@ def AddTest(env, test_variant, envlist, settings, is_broken):
       stdout_golden=nodes[0])
 
   env.AddNodeToTestSuite(node, ['medium_tests', 'nonpexe_tests'],
-                         'run_' + test_variant + '_test',
-                         is_broken=is_broken)
+                         'run_' + test_variant + '_test')
 
 
 if env.Bit('bitcode'):
@@ -122,14 +121,13 @@ if env.Bit('bitcode'):
   settings = dict(base_settings)
   envlist = [base_env]
   link_env = base_env
-  AddTest(base_env, 'callingconv_self', envlist, settings, is_broken=False)
+  AddTest(base_env, 'callingconv_self', envlist, settings)
 
   # (2) Cross-check.
   if env.Bit('target_arm'):
-    # BUG: http://code.google.com/p/nativeclient/issues/detail?id=2378
+    # Constant pool items are sometimes too far away with nacl-gcc.
+    # BUG: http://code.google.com/p/nativeclient/issues/detail?id=3205
     settings['allow_double'] = 0
-    # BUG: http://code.google.com/p/nativeclient/issues/detail?id=3143
-    settings['allow_struct'] = 0
 
   envlist = []
   pnacl_env = base_env.Clone()
@@ -153,12 +151,7 @@ if env.Bit('bitcode'):
   envlist.append(native_env)
   link_env = pnacl_env
 
-  # TODO(mcgrathr): Remove after fix for ARM:
-  # https://code.google.com/p/nativeclient/issues/detail?id=3143
-  # Also broken on x86_32:
-  # https://code.google.com/p/nativeclient/issues/detail?id=3650
-  is_broken = env.Bit('target_arm') or env.Bit('target_x86_32')
-  AddTest(base_env, 'callingconv', envlist, settings, is_broken)
+  AddTest(base_env, 'callingconv', envlist, settings)
 else:
   # For NNaCl toolchain, just test self-consistency.
   settings = dict(base_settings)
@@ -168,4 +161,4 @@ else:
     # Constant pool items sometimes too far away:
     # BUG: http://code.google.com/p/nativeclient/issues/detail?id=3205
     settings['allow_double'] = 0
-  AddTest(base_env, 'callingconv', envlist, settings, is_broken=False)
+  AddTest(base_env, 'callingconv', envlist, settings)