From 7acb4655f77b738d7d09bdde7a3e26e91a6c3dee Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 10 Feb 2017 10:59:23 -0800
Subject: [PATCH] Enable libc++ tests for x86_64.

Test: ./run_tests.py --suite libc++ --abi x86_64
Bug: https://github.com/android-ndk/ndk/issues/294
Change-Id: I4756693e0cf0459b9488d940358035ac91214134
---
 .../numerics/complex_number/complex_member_ops/test_config.py  | 3 ++-
 .../std/numerics/complex_number/complex_ops/test_config.py     | 3 ++-
 .../complex_number/complex_transcendentals/test_config.py      | 3 ++-
 tests/libc++/test/std/numerics/complex_number/test_config.py   | 3 ++-
 tests/testlib.py                                               | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/libc++/test/std/numerics/complex_number/complex_member_ops/test_config.py b/tests/libc++/test/std/numerics/complex_number/complex_member_ops/test_config.py
index ad8f56b8..f7aea94b 100644
--- a/tests/libc++/test/std/numerics/complex_number/complex_member_ops/test_config.py
+++ b/tests/libc++/test/std/numerics/complex_number/complex_member_ops/test_config.py
@@ -1,4 +1,5 @@
 def build_broken(abi, api, toolchain, name):
-    if abi == 'arm64-v8a' and name == 'divide_equal_complex.pass':
+    broken_abis = ('arm64-v8a', 'x86_64')
+    if abi in broken_abis and name == 'divide_equal_complex.pass':
         return abi, 'https://github.com/android-ndk/ndk/issues/294'
     return None, None
diff --git a/tests/libc++/test/std/numerics/complex_number/complex_ops/test_config.py b/tests/libc++/test/std/numerics/complex_number/complex_ops/test_config.py
index fae8b400..ee189fc8 100644
--- a/tests/libc++/test/std/numerics/complex_number/complex_ops/test_config.py
+++ b/tests/libc++/test/std/numerics/complex_number/complex_ops/test_config.py
@@ -3,6 +3,7 @@ def build_broken(abi, api, toolchain, name):
         'complex_divide_complex.pass',
         'scalar_divide_complex.pass',
     )
-    if abi == 'arm64-v8a' and name in broken_tests:
+    broken_abis = ('arm64-v8a', 'x86_64')
+    if abi in broken_abis and name in broken_tests:
         return abi, 'https://github.com/android-ndk/ndk/issues/294'
     return None, None
diff --git a/tests/libc++/test/std/numerics/complex_number/complex_transcendentals/test_config.py b/tests/libc++/test/std/numerics/complex_number/complex_transcendentals/test_config.py
index 48830a4c..45aa57ef 100644
--- a/tests/libc++/test/std/numerics/complex_number/complex_transcendentals/test_config.py
+++ b/tests/libc++/test/std/numerics/complex_number/complex_transcendentals/test_config.py
@@ -1,4 +1,5 @@
 def build_broken(abi, api, toolchain, name):
-    if abi == 'arm64-v8a' and name in ('atan.pass', 'atanh.pass'):
+    broken_abis = ('arm64-v8a', 'x86_64')
+    if abi in broken_abis and name in ('atan.pass', 'atanh.pass'):
         return abi, 'https://github.com/android-ndk/ndk/issues/294'
     return None, None
diff --git a/tests/libc++/test/std/numerics/complex_number/test_config.py b/tests/libc++/test/std/numerics/complex_number/test_config.py
index ad8f56b8..f7aea94b 100644
--- a/tests/libc++/test/std/numerics/complex_number/test_config.py
+++ b/tests/libc++/test/std/numerics/complex_number/test_config.py
@@ -1,4 +1,5 @@
 def build_broken(abi, api, toolchain, name):
-    if abi == 'arm64-v8a' and name == 'divide_equal_complex.pass':
+    broken_abis = ('arm64-v8a', 'x86_64')
+    if abi in broken_abis and name == 'divide_equal_complex.pass':
         return abi, 'https://github.com/android-ndk/ndk/issues/294'
     return None, None
diff --git a/tests/testlib.py b/tests/testlib.py
index 8a0cc8bc..cd1c7fe2 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -1364,6 +1364,7 @@ def check_unsupported(self):
             'arm64-v8a',
             'armeabi-v7a',
             'x86',
+            'x86_64',
         )
 
         if self.abi not in supported_abis: