Add test.py tests to the tests package.

This lets us import from the NDK's python library, so we can abstract some of this away rather than duplicating it in every similar test. This also allows our pylintrc to apply to each test. Test: ./validate.py --filter standalone_toolchain* Bug: android/ndk#310 Change-Id: Ib112cca91b56009c838bc1712c8a9285a40976c1
a252539783 · Mar 7, 2017 · 4b25333 · 4b25333
1 parent ee76735
commit 4b25333
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 12 deletions.
diff --git a/tests/build/NDK_ANALYZE/__init__.py b/tests/build/NDK_ANALYZE/__init__.py
diff --git a/tests/build/__init__.py b/tests/build/__init__.py
diff --git a/tests/build/application_mk/__init__.py b/tests/build/application_mk/__init__.py
diff --git a/tests/build/mstack-protector-guard/__init__.py b/tests/build/mstack-protector-guard/__init__.py
diff --git a/tests/build/mstackrealign/__init__.py b/tests/build/mstackrealign/__init__.py
diff --git a/tests/build/standalone_toolchain/__init__.py b/tests/build/standalone_toolchain/__init__.py
diff --git a/...lone-toolchain-deprecated-headers/foo.cpp → tests/build/standalone_toolchain/foo.cpp b/...lone-toolchain-deprecated-headers/foo.cpp → tests/build/standalone_toolchain/foo.cpp
diff --git a/tests/build/standalone-toolchain/test.py → tests/build/standalone_toolchain/test.py b/tests/build/standalone-toolchain/test.py → tests/build/standalone_toolchain/test.py
@@ -16,13 +16,10 @@
 import logging
 import os
 import shutil
-import site
 import subprocess
 import tempfile
 
-site.addsitedir(os.path.join(os.environ['NDK'], 'build/lib'))
-
-import build_support  # pylint: disable=import-error
+import build.lib.build_support
 
 
 def logger():
@@ -56,7 +53,7 @@ def make_standalone_toolchain(arch, platform, install_dir):
 
 def test_standalone_toolchain(arch, toolchain, install_dir):
     if toolchain == '4.9':
-        triple = build_support.arch_to_triple(arch)
+        triple = build.lib.build_support.arch_to_triple(arch)
         # x86 toolchain names are dumb: http://b/25800583
         if arch == 'x86':
             triple = 'i686-linux-android'
@@ -77,7 +74,7 @@ def run_test(abi=None, platform=None, toolchain=None,
              build_flags=None):  # pylint: disable=unused-argument
     arch = 'arm'
     if abi is not None:
-        arch = build_support.abi_to_arch(abi)
+        arch = build.lib.build_support.abi_to_arch(abi)
 
     install_dir = tempfile.mkdtemp()
     try:

diff --git a/...olchain-deprecated-headers/test_config.py → ...build/standalone_toolchain/test_config.py b/...olchain-deprecated-headers/test_config.py → ...build/standalone_toolchain/test_config.py
diff --git a/tests/build/standalone_toolchain_deprecated_headers/__init__.py b/tests/build/standalone_toolchain_deprecated_headers/__init__.py
diff --git a/tests/build/standalone-toolchain/foo.cpp → ...lone_toolchain_deprecated_headers/foo.cpp b/tests/build/standalone-toolchain/foo.cpp → ...lone_toolchain_deprecated_headers/foo.cpp
diff --git a/...lone-toolchain-deprecated-headers/test.py → ...lone_toolchain_deprecated_headers/test.py b/...lone-toolchain-deprecated-headers/test.py → ...lone_toolchain_deprecated_headers/test.py
@@ -16,13 +16,10 @@
 import logging
 import os
 import shutil
-import site
 import subprocess
 import tempfile
 
-site.addsitedir(os.path.join(os.environ['NDK'], 'build/lib'))
-
-import build_support  # pylint: disable=import-error
+import build.lib.build_support
 
 
 def logger():
@@ -57,7 +54,7 @@ def make_standalone_toolchain(arch, platform, install_dir):
 
 def test_standalone_toolchain(arch, toolchain, install_dir):
     if toolchain == '4.9':
-        triple = build_support.arch_to_triple(arch)
+        triple = build.lib.build_support.arch_to_triple(arch)
         # x86 toolchain names are dumb: http://b/25800583
         if arch == 'x86':
             triple = 'i686-linux-android'
@@ -78,7 +75,7 @@ def run_test(abi=None, platform=None, toolchain=None,
              build_flags=None):  # pylint: disable=unused-argument
     arch = 'arm'
     if abi is not None:
-        arch = build_support.abi_to_arch(abi)
+        arch = build.lib.build_support.abi_to_arch(abi)
 
     install_dir = tempfile.mkdtemp()
     try:

diff --git a/...build/standalone-toolchain/test_config.py → ...olchain_deprecated_headers/test_config.py b/...build/standalone-toolchain/test_config.py → ...olchain_deprecated_headers/test_config.py