| Message ID | 20220727161309.3616285-1-arnout@mind.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | support/testing/tests/init/test_systemd.py: use downloaded kernel | expand |
On 27/07/2022 18:13, Arnout Vandecappelle (Essensium/Mind) wrote: > Since systemd requires a relatively new kernel, we switched to a > self-built 4.19.204 kernel. However, since then, the downloaded kernel > used by the tests has been updated to 5.10, which is certainly recent > enough to support systemd. Switch to this one. This reduces the test > time significantly. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> D'oh, I was waiting for the pipeline so I could add this: --- Runtime tests: https://gitlab.com/buildroot.org/buildroot/-/pipelines/598368431 Regards, Arnout > --- > support/testing/tests/init/test_systemd.py | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py > index 80c6776f59..be28209ba0 100644 > --- a/support/testing/tests/init/test_systemd.py > +++ b/support/testing/tests/init/test_systemd.py > @@ -11,18 +11,11 @@ class InitSystemSystemdBase(InitSystemBase): > BR2_TOOLCHAIN_EXTERNAL=y > BR2_INIT_SYSTEMD=y > BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > - BR2_LINUX_KERNEL=y > - BR2_LINUX_KERNEL_CUSTOM_VERSION=y > - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" > - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > - BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" > - BR2_LINUX_KERNEL_DTS_SUPPORT=y > - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > # BR2_TARGET_ROOTFS_TAR is not set > - """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) > + """ > > def check_systemd(self, fs): > - self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") > + self.start_emulator(fs) > self.check_init("/lib/systemd/systemd") > > # Test all units are OK
Arnout, All, On 2022-07-27 18:14 +0200, Arnout Vandecappelle spake thusly: > On 27/07/2022 18:13, Arnout Vandecappelle (Essensium/Mind) wrote: > >Since systemd requires a relatively new kernel, we switched to a > >self-built 4.19.204 kernel. However, since then, the downloaded kernel > >used by the tests has been updated to 5.10, which is certainly recent > >enough to support systemd. Switch to this one. This reduces the test > >time significantly. > > > >Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Applied to master, thanks. > D'oh, I was waiting for the pipeline so I could add this: > --- > Runtime tests: https://gitlab.com/buildroot.org/buildroot/-/pipelines/598368431 Nice, thanks! Still applied to master, though! ;-] Regards, Yann E. MORIN. > > Regards, > Arnout > > >--- > > support/testing/tests/init/test_systemd.py | 11 ++--------- > > 1 file changed, 2 insertions(+), 9 deletions(-) > > > >diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py > >index 80c6776f59..be28209ba0 100644 > >--- a/support/testing/tests/init/test_systemd.py > >+++ b/support/testing/tests/init/test_systemd.py > >@@ -11,18 +11,11 @@ class InitSystemSystemdBase(InitSystemBase): > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_INIT_SYSTEMD=y > > BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > >- BR2_LINUX_KERNEL=y > >- BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" > >- BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > >- BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" > >- BR2_LINUX_KERNEL_DTS_SUPPORT=y > >- BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > > # BR2_TARGET_ROOTFS_TAR is not set > >- """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) > >+ """ > > def check_systemd(self, fs): > >- self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") > >+ self.start_emulator(fs) > > self.check_init("/lib/systemd/systemd") > > # Test all units are OK > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 80c6776f59..be28209ba0 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -11,18 +11,11 @@ class InitSystemSystemdBase(InitSystemBase): BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" # BR2_TARGET_ROOTFS_TAR is not set - """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) + """ def check_systemd(self, fs): - self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") + self.start_emulator(fs) self.check_init("/lib/systemd/systemd") # Test all units are OK
Since systemd requires a relatively new kernel, we switched to a self-built 4.19.204 kernel. However, since then, the downloaded kernel used by the tests has been updated to 5.10, which is certainly recent enough to support systemd. Switch to this one. This reduces the test time significantly. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- support/testing/tests/init/test_systemd.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)