From 32394c07336b361de0ec7e29f88ffd9a7bcee3ac Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 23 Sep 2021 14:16:16 +0200 Subject: [PATCH] hello: fix resource config / add to autopilot list --- repos/hello_tutorial/doc/hello_tutorial.txt | 10 +++++----- repos/hello_tutorial/run/hello.run | 2 +- tool/autopilot.list | 21 +++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/repos/hello_tutorial/doc/hello_tutorial.txt b/repos/hello_tutorial/doc/hello_tutorial.txt index 0ae6d2c408..8cf1a95a6e 100644 --- a/repos/hello_tutorial/doc/hello_tutorial.txt +++ b/repos/hello_tutorial/doc/hello_tutorial.txt @@ -257,10 +257,10 @@ entry to init's 'config' file, which is located at 'build/bin/config'. ! ! ! -! +! ! ! -! +! ! ! @@ -408,7 +408,7 @@ script, which can be executed directly from within your build directory. A run script for the hello client-server scenario should be placed at the _run/hello.run_ and look as follows: -!build { core ld.lib.so init hello } +!build { core init hello } ! !create_boot_directory ! @@ -420,7 +420,7 @@ at the _run/hello.run_ and look as follows: ! ! ! -! +! ! ! ! @@ -430,7 +430,7 @@ at the _run/hello.run_ and look as follows: ! !} ! -!build_boot_image { core init hello_client hello_server } +!build_boot_image { core ld.lib.so init hello_client hello_server } ! !append qemu_args " -nographic " ! diff --git a/repos/hello_tutorial/run/hello.run b/repos/hello_tutorial/run/hello.run index 0e0bfb571f..f41fabc170 100644 --- a/repos/hello_tutorial/run/hello.run +++ b/repos/hello_tutorial/run/hello.run @@ -21,7 +21,7 @@ install_config { - + diff --git a/tool/autopilot.list b/tool/autopilot.list index 4b4c75cde7..2706a8245b 100644 --- a/tool/autopilot.list +++ b/tool/autopilot.list @@ -1,32 +1,33 @@ aes_cbc_4k bomb cbe_tester -cpu_bench cpu_balancer +cpu_bench cpu_quota cpu_sampler demo depot_autopilot depot_download depot_query +event_filter extract fb_bench fetchurl_lwip fetchurl_lxip fs_query gdb_monitor +hello ieee754 init_smp -event_filter libc_integration libc_vfs_fs_ext2 libc_vfs_fs_fat log_core lwip +lx_fs_import lx_hybrid_ctors lx_hybrid_exception lx_hybrid_pthread_ipc -lx_fs_import microcode migrate moon @@ -42,14 +43,13 @@ nic_bridge nic_bridge_stress nic_dump nic_router -nic_router_ipv4_fragm -nic_router_disable_arp nic_router_dhcp_managed nic_router_dhcp_unmanaged +nic_router_disable_arp nic_router_flood +nic_router_ipv4_fragm nic_router_stress nic_router_uplinks -tool_chain_auto nvme ping ping_nic_router @@ -58,17 +58,18 @@ rtc rump_ext2 sd_card_bench seoul-auto -ssh_exec_channel smartcard smbios_decoder smp sntp_client +ssh_exec_channel sub_rm tar_rom thread timeout timeout_smp timer_accuracy +tool_chain_auto tz_vmm usb_hid_raw usb_hid_reconnect @@ -86,11 +87,11 @@ vbox5_win7_64 vbox5_win7_64_multiple vbox5_win7_64_raw vbox5_win7_64_share -vm_stress_vbox5-debian32 -vm_stress_vbox5-debian64 -vm_stress_seoul-debian32 verify vfs_cfg vfs_import +vm_stress_seoul-debian32 +vm_stress_vbox5-debian32 +vm_stress_vbox5-debian64 vmm_arm vmm_x86