diff options
| author | Simon Glass <sjg@chromium.org> | 2018-10-01 21:12:43 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-10-08 07:34:34 -0600 |
| commit | 4b4bc06ef4e37f79604ff8fa2142057e2cb05437 (patch) | |
| tree | 96bdc3a79061d8298c2a31a6e121de9223159946 | |
| parent | 86af511d892df59f06bf49a71505a072ea2cd5f3 (diff) | |
| download | u-boot-4b4bc06ef4e37f79604ff8fa2142057e2cb05437.zip u-boot-4b4bc06ef4e37f79604ff8fa2142057e2cb05437.tar.gz u-boot-4b4bc06ef4e37f79604ff8fa2142057e2cb05437.tar.bz2 | |
buildman: dtoc: Suppress unwanted output from test
There are a few test cases which print output. Suppress this so that tests
can run silently in the normal case.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/buildman/test.py | 4 | ||||
| -rw-r--r-- | tools/dtoc/test_dtoc.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 7259f7b..e0c9d6d 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -20,6 +20,7 @@ import control import command import commit import terminal +import test_util import toolchain use_network = True @@ -422,7 +423,8 @@ class TestBuild(unittest.TestCase): def testToolchainDownload(self): """Test that we can download toolchains""" if use_network: - url = self.toolchains.LocateArchUrl('arm') + with test_util.capture_sys_output() as (stdout, stderr): + url = self.toolchains.LocateArchUrl('arm') self.assertRegexpMatches(url, 'https://www.kernel.org/pub/tools/' 'crosstool/files/bin/x86_64/.*/' 'x86_64-gcc-.*-nolibc_arm-.*linux-gnueabi.tar.xz') diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 72bcb37..11bead1 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -385,7 +385,8 @@ U_BOOT_DEVICE(phandle_source2) = { def test_phandle_bad(self): """Test a node containing an invalid phandle fails""" - dtb_file = get_dtb_file('dtoc_test_phandle_bad.dts') + dtb_file = get_dtb_file('dtoc_test_phandle_bad.dts', + capture_stderr=True) output = tools.GetOutputFilename('output') with self.assertRaises(ValueError) as e: dtb_platdata.run_steps(['struct'], dtb_file, False, output) @@ -394,7 +395,8 @@ U_BOOT_DEVICE(phandle_source2) = { def test_phandle_bad2(self): """Test a phandle target missing its #*-cells property""" - dtb_file = get_dtb_file('dtoc_test_phandle_bad2.dts') + dtb_file = get_dtb_file('dtoc_test_phandle_bad2.dts', + capture_stderr=True) output = tools.GetOutputFilename('output') with self.assertRaises(ValueError) as e: dtb_platdata.run_steps(['struct'], dtb_file, False, output) |