Support logging in standalone toolchain tests.
Change-Id: I14b731d35a2d8547b26383e0ad51b618ff96d3dc
(cherry picked from commit e4b068d1ab909aa4a1c3d5e04e053f9877e3f44b)
diff --git a/tests/build/standalone-toolchain/test.py b/tests/build/standalone-toolchain/test.py
index 5786703..3fe75ed 100644
--- a/tests/build/standalone-toolchain/test.py
+++ b/tests/build/standalone-toolchain/test.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+import logging
import os
import shutil
import site
@@ -24,6 +25,18 @@
import build_support # pylint: disable=import-error
+def logger():
+ return logging.getLogger(__name__)
+
+
+def call_output(cmd, *args, **kwargs):
+ logger().info('COMMAND: ' + ' '.join(cmd))
+ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, *args, **kwargs)
+ out, _ = proc.communicate()
+ return proc.returncode, out
+
+
def make_standalone_toolchain(arch, platform, install_dir):
ndk_dir = os.environ['NDK']
make_standalone_toolchain_path = os.path.join(
@@ -37,10 +50,8 @@
if platform is not None:
cmd.append('--api=' + platform)
- proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
- out, _ = proc.communicate()
- return proc.returncode == 0, out
+ rc, out = call_output(cmd)
+ return rc == 0, out
def test_standalone_toolchain(arch, toolchain, install_dir):
@@ -58,10 +69,8 @@
compiler = os.path.join(install_dir, 'bin', compiler_name)
test_source = 'foo.cpp'
cmd = [compiler, '-shared', test_source, '-Wl,--no-undefined']
- proc = subprocess.Popen(
- cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- out, _ = proc.communicate()
- return proc.returncode == 0, out
+ rc, out = call_output(cmd)
+ return rc == 0, out
def run_test(abi=None, platform=None, toolchain=None,
diff --git a/tests/runners.py b/tests/runners.py
index 1373517..9b566b4 100644
--- a/tests/runners.py
+++ b/tests/runners.py
@@ -15,6 +15,7 @@
#
from __future__ import print_function
+import logging
import os
import subprocess
import sys
@@ -165,6 +166,7 @@
if build_api_level is not None:
ndk_build_flags.append('APP_PLATFORM={}'.format(build_api_level))
if verbose_ndk_build:
+ logging.basicConfig(level=logging.INFO)
ndk_build_flags.append('V=1')
# Do this early so we find any device issues now rather than after we've
