Skip to content

Commit

Permalink
support/testing: test syslog-ng with builtin kernel
Browse files Browse the repository at this point in the history
Use the new builtin kernel 4.19 with VirtIORNG to provide entropy to
test syslog-ng.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  • Loading branch information
ricardo-martincoski authored and jacmet committed Aug 3, 2019
1 parent 7acb32d commit 56e38a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
3 changes: 0 additions & 3 deletions support/testing/conf/syslog-ng-kernel-fragment.config

This file was deleted.

20 changes: 4 additions & 16 deletions support/testing/tests/package/test_syslog_ng.py
Expand Up @@ -6,29 +6,17 @@
class TestSyslogNg(infra.basetest.BRTest):
config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
"""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_SYSLOG_NG=y
BR2_TARGET_ROOTFS_CPIO=y
# BR2_TARGET_ROOTFS_TAR is not set
""".format(infra.filepath("conf/syslog-ng-kernel-fragment.config"))
"""

def test_run(self):
kernel = os.path.join(self.builddir, "images", "zImage")
cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
dtb = os.path.join(self.builddir, "images", "versatile-pb.dtb")
options = ["-M", "versatilepb",
"-dtb", dtb,
"-initrd", cpio_file,
"-device", "virtio-rng-pci"]
self.emulator.boot(arch="armv5", kernel=kernel, options=options)
self.emulator.boot(arch="armv5",
kernel="builtin",
options=["-initrd", cpio_file])
self.emulator.login()

cmd = "grep syslog-ng /var/log/messages | grep starting"
Expand Down

0 comments on commit 56e38a7

Please sign in to comment.