Import 80d60e7 from yoctoproject.org meta-arm
To support ARMv8 SoCs.
meta-arm has several patch files. Since they are maintained by the
upstream meta-arm community, add meta-arm to the ignore list in
run-repotest.
Change-Id: Ia87a2e947bbabd347d256eccc47a343e1c885479
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/runfvp.py b/meta-arm/meta-arm/lib/oeqa/selftest/cases/runfvp.py
new file mode 100644
index 0000000..d1e452f
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/runfvp.py
@@ -0,0 +1,109 @@
+import asyncio
+import os
+import pathlib
+import subprocess
+import tempfile
+import unittest.mock
+
+from oeqa.selftest.case import OESelftestTestCase
+
+runfvp = pathlib.Path(__file__).parents[5] / "scripts" / "runfvp"
+testdir = pathlib.Path(__file__).parent / "tests"
+
+class RunFVPTests(OESelftestTestCase):
+ def setUpLocal(self):
+ self.assertTrue(runfvp.exists())
+
+ def run_fvp(self, *args, should_succeed=True):
+ """
+ Call runfvp passing any arguments. If check is True verify return stdout
+ on exit code 0 or fail the test, otherwise return the CompletedProcess
+ instance.
+ """
+ # Put the test directory in PATH so that any mock FVPs are found first
+ newenv = {"PATH": str(testdir) + ":" + os.environ["PATH"]}
+ cli = [runfvp,] + list(args)
+ print(f"Calling {cli}")
+ ret = subprocess.run(cli, env=newenv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+ if should_succeed:
+ self.assertEqual(ret.returncode, 0, f"runfvp exit {ret.returncode}, output: {ret.stdout}")
+ return ret.stdout
+ else:
+ self.assertNotEqual(ret.returncode, 0, f"runfvp exit {ret.returncode}, output: {ret.stdout}")
+ return ret.stdout
+
+ def test_help(self):
+ output = self.run_fvp("--help")
+ self.assertIn("Run images in a FVP", output)
+
+ def test_bad_options(self):
+ self.run_fvp("--this-is-an-invalid-option", should_succeed=False)
+
+ def test_run_auto_tests(self):
+ newenv = {"PATH": str(testdir) + ":" + os.environ["PATH"]}
+
+ cases = list(testdir.glob("auto-*.json"))
+ if not cases:
+ self.fail("No tests found")
+ for case in cases:
+ with self.subTest(case=case.stem):
+ self.run_fvp(case)
+
+ def test_fvp_options(self):
+ # test-parameter sets one argument, add another manually
+ self.run_fvp(testdir / "test-parameter.json", "--", "--parameter", "board.dog=woof")
+
+class ConfFileTests(OESelftestTestCase):
+ def test_no_exe(self):
+ from fvp import conffile
+ with tempfile.NamedTemporaryFile('w') as tf:
+ tf.write('{}')
+ tf.flush()
+
+ with self.assertRaises(ValueError):
+ conffile.load(tf.name)
+
+ def test_minimal(self):
+ from fvp import conffile
+ with tempfile.NamedTemporaryFile('w') as tf:
+ tf.write('{"exe": "FVP_Binary"}')
+ tf.flush()
+
+ conf = conffile.load(tf.name)
+ self.assertTrue('fvp-bindir' in conf)
+ self.assertTrue('fvp-bindir' in conf)
+ self.assertTrue("exe" in conf)
+ self.assertTrue("parameters" in conf)
+ self.assertTrue("data" in conf)
+ self.assertTrue("applications" in conf)
+ self.assertTrue("terminals" in conf)
+ self.assertTrue("args" in conf)
+ self.assertTrue("consoles" in conf)
+
+
+class RunnerTests(OESelftestTestCase):
+ def create_mock(self):
+ return unittest.mock.patch("asyncio.create_subprocess_exec")
+
+ def test_start(self):
+ from fvp import runner
+ with self.create_mock() as m:
+ fvp = runner.FVPRunner(self.logger)
+ asyncio.run(fvp.start({
+ "fvp-bindir": "/usr/bin",
+ "exe": "FVP_Binary",
+ "parameters": {'foo': 'bar'},
+ "data": ['data1'],
+ "applications": {'a1': 'file'},
+ "terminals": {},
+ "args": ['--extra-arg'],
+ }))
+
+ m.assert_called_once_with('/usr/bin/FVP_Binary',
+ '--parameter', 'foo=bar',
+ '--data', 'data1',
+ '--application', 'a1=file',
+ '--extra-arg',
+ stdin=unittest.mock.ANY,
+ stdout=unittest.mock.ANY,
+ stderr=unittest.mock.ANY)
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.json b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.json
new file mode 100644
index 0000000..476eb57
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.json
@@ -0,0 +1,3 @@
+{
+ "exe": "auto-basic.sh"
+}
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.sh b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.sh
new file mode 100755
index 0000000..ea9abac
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-basic.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e -u
+
+if [ $# = 0 ]; then
+ echo No arguments as expected
+ exit 0
+else
+ echo Unexpected arguments: $*
+ exit 1
+fi
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-parameters.json b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-parameters.json
new file mode 100644
index 0000000..0c7d4ef
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/auto-parameters.json
@@ -0,0 +1,7 @@
+{
+ "exe": "test-parameters.py",
+ "parameters": {
+ "board.cow": "moo",
+ "board.dog": "woof"
+ }
+}
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/mock-fvp.py b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/mock-fvp.py
new file mode 100755
index 0000000..2213c9f
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/mock-fvp.py
@@ -0,0 +1,22 @@
+#! /usr/bin/env python3
+
+import argparse
+import sys
+
+def do_test_parameters(args):
+ if not args.parameter or set(args.parameter) != set(("board.cow=moo", "board.dog=woof")):
+ print(f"Unexpected arguments: {args}")
+ sys.exit(1)
+
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+ parser.add_argument("-C", "--parameter", action="append")
+ args = parser.parse_args()
+
+ function = "do_" + parser.prog.replace("-", "_").replace(".py", "")
+ if function in locals():
+ locals()[function](args)
+ else:
+ print(f"Unknown mock mode {parser.prog}")
+ sys.exit(1)
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameter.json b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameter.json
new file mode 100644
index 0000000..9b565f2
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameter.json
@@ -0,0 +1,6 @@
+{
+ "exe": "test-parameters.py",
+ "parameters": {
+ "board.cow": "moo"
+ }
+}
diff --git a/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameters.py b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameters.py
new file mode 120000
index 0000000..c734eec
--- /dev/null
+++ b/meta-arm/meta-arm/lib/oeqa/selftest/cases/tests/test-parameters.py
@@ -0,0 +1 @@
+mock-fvp.py
\ No newline at end of file