From c9f593d803cbddfa84e052a4d7bb03beeafbdc48 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 24 May 2017 11:29:37 +0200 Subject: [PATCH] Use default Qemu memory size in run-scripts Ref #74 --- run/abuse.run | 2 +- run/cave_story.run | 2 +- run/chroot.run | 2 +- run/chuck.run | 2 +- run/chuck_keyboard.run | 2 +- run/chuck_mouse.run | 2 +- run/driar.run | 2 +- run/eigentor.run | 2 +- run/framebuffer_app.inc | 1 - run/glucose.run | 2 +- run/grafx2.run | 1 - run/keynote.run | 1 - run/lemon.run | 2 +- run/libpq_create_db.run | 1 - run/libpq_createdb_db.run | 1 - run/libpq_list_db.run | 1 - run/libpq_update_db.run | 1 - run/libpqxx_conection.run | 1 - run/libpqxx_creation_table.run | 1 - run/libpqxx_delete_operation.run | 1 - run/libpqxx_insert_operation.run | 1 - run/libpqxx_select_operation.run | 1 - run/libpqxx_update_operation.run | 1 - run/log_tee.run | 2 +- run/lz_rom_noux.run | 1 - run/scip.run | 2 +- run/soplex.run | 2 +- run/sqlite_speedtest.run | 2 +- run/superbossgaiden.run | 2 +- run/tyrian.run | 2 +- run/tyrquake.run | 2 +- run/uhexen2.run | 2 +- run/usb_gamepad_input.run | 2 +- 33 files changed, 19 insertions(+), 33 deletions(-) diff --git a/run/abuse.run b/run/abuse.run index 198b38d..8275475 100644 --- a/run/abuse.run +++ b/run/abuse.run @@ -150,6 +150,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/cave_story.run b/run/cave_story.run index 968dfda..9726daf 100644 --- a/run/cave_story.run +++ b/run/cave_story.run @@ -195,6 +195,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/chroot.run b/run/chroot.run index 21daa6e..ffc0662 100644 --- a/run/chroot.run +++ b/run/chroot.run @@ -120,7 +120,7 @@ build_boot_image { # Execute test case # -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until {child "test-libc-3" exited with exit value 0} 60 # vi: set ft=tcl : diff --git a/run/chuck.run b/run/chuck.run index 0a6cc04..e6920b2 100644 --- a/run/chuck.run +++ b/run/chuck.run @@ -126,6 +126,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 128 -nographic -soundhw es1370 " +append qemu_args " -nographic -soundhw es1370 " run_genode_until {child "chuck" exited with exit value 0} 60 diff --git a/run/chuck_keyboard.run b/run/chuck_keyboard.run index 88cac96..9476ab6 100644 --- a/run/chuck_keyboard.run +++ b/run/chuck_keyboard.run @@ -186,6 +186,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 128 -nographic -soundhw es1370 " +append qemu_args " -nographic -soundhw es1370 " run_genode_until forever diff --git a/run/chuck_mouse.run b/run/chuck_mouse.run index 28c984a..9d48069 100644 --- a/run/chuck_mouse.run +++ b/run/chuck_mouse.run @@ -220,6 +220,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 128 -nographic -soundhw es1370 " +append qemu_args " -nographic -soundhw es1370 " run_genode_until forever diff --git a/run/driar.run b/run/driar.run index 2c3accc..5b6740a 100644 --- a/run/driar.run +++ b/run/driar.run @@ -205,7 +205,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " puts "\n################\n" set txt [open "bin/Driar.txt" r] diff --git a/run/eigentor.run b/run/eigentor.run index 354cf34..b0c832d 100644 --- a/run/eigentor.run +++ b/run/eigentor.run @@ -242,7 +242,7 @@ if {[have_include power_on/qemu]} { exec sudo iptables -A FORWARD -i $netdev -o $tapdev -m state --state RELATED,ESTABLISHED -j ACCEPT exec sudo sysctl -w net.ipv4.ip_forward=1 - append qemu_args " -m 256 -nographic -net nic,model=e1000 -net tap,ifname=tap0,downscript=no,script=no " + append qemu_args " -nographic -net nic,model=e1000 -net tap,ifname=tap0,downscript=no,script=no " } diff --git a/run/framebuffer_app.inc b/run/framebuffer_app.inc index 6f0c1d2..c2e1a07 100644 --- a/run/framebuffer_app.inc +++ b/run/framebuffer_app.inc @@ -136,6 +136,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/run/glucose.run b/run/glucose.run index 3a6cf1f..132d2f6 100644 --- a/run/glucose.run +++ b/run/glucose.run @@ -82,7 +82,7 @@ build_boot_image { Test.cnf } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until {.*Okay.*} 20 diff --git a/run/grafx2.run b/run/grafx2.run index 0fd53b3..0f11510 100644 --- a/run/grafx2.run +++ b/run/grafx2.run @@ -140,6 +140,5 @@ lappend_if [have_spec platform_rpi] boot_modules platform_drv build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/run/keynote.run b/run/keynote.run index f9bf406..05437c0 100755 --- a/run/keynote.run +++ b/run/keynote.run @@ -55,6 +55,5 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until {.*exited with exit value 0.*} 20 diff --git a/run/lemon.run b/run/lemon.run index 9b18639..d26ac21 100644 --- a/run/lemon.run +++ b/run/lemon.run @@ -36,7 +36,7 @@ build_boot_image { stdcxx.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "child \"test-lemon\" exited with exit value 0" 20 diff --git a/run/libpq_create_db.run b/run/libpq_create_db.run index 6457655..628f4a1 100644 --- a/run/libpq_create_db.run +++ b/run/libpq_create_db.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpq_createdb_db.run b/run/libpq_createdb_db.run index a07c70e..14849de 100644 --- a/run/libpq_createdb_db.run +++ b/run/libpq_createdb_db.run @@ -109,7 +109,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpq_list_db.run b/run/libpq_list_db.run index 844fc29..e3c33e5 100644 --- a/run/libpq_list_db.run +++ b/run/libpq_list_db.run @@ -106,7 +106,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpq_update_db.run b/run/libpq_update_db.run index 14026ad..6964d51 100644 --- a/run/libpq_update_db.run +++ b/run/libpq_update_db.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_conection.run b/run/libpqxx_conection.run index c3b6daa..2dac84c 100644 --- a/run/libpqxx_conection.run +++ b/run/libpqxx_conection.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_creation_table.run b/run/libpqxx_creation_table.run index eeb7251..4c71240 100644 --- a/run/libpqxx_creation_table.run +++ b/run/libpqxx_creation_table.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_delete_operation.run b/run/libpqxx_delete_operation.run index bfa7a9f..b0afb6b 100644 --- a/run/libpqxx_delete_operation.run +++ b/run/libpqxx_delete_operation.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_insert_operation.run b/run/libpqxx_insert_operation.run index 6bcba9a..1d2ea7e 100644 --- a/run/libpqxx_insert_operation.run +++ b/run/libpqxx_insert_operation.run @@ -110,7 +110,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_select_operation.run b/run/libpqxx_select_operation.run index fc82fd9..d03ff6b 100644 --- a/run/libpqxx_select_operation.run +++ b/run/libpqxx_select_operation.run @@ -107,7 +107,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/libpqxx_update_operation.run b/run/libpqxx_update_operation.run index 4e4db00..4f14a8b 100644 --- a/run/libpqxx_update_operation.run +++ b/run/libpqxx_update_operation.run @@ -110,7 +110,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/run/log_tee.run b/run/log_tee.run index c438692..211dacc 100644 --- a/run/log_tee.run +++ b/run/log_tee.run @@ -32,6 +32,6 @@ install_config { build_boot_image "core ld.lib.so init log_tee test-log" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {\[test-log\] Test done.} 10 diff --git a/run/lz_rom_noux.run b/run/lz_rom_noux.run index 9872d33..c1217a1 100644 --- a/run/lz_rom_noux.run +++ b/run/lz_rom_noux.run @@ -108,7 +108,6 @@ append qemu_args " -nographic -serial mon:stdio " if {[have_spec x86_64]} { # coreutils.tar is really huge when built for x86_64 - append qemu_args " -m 300 " } run_genode_until {child "noux" exited with exit value 0.*\n} 30 diff --git a/run/scip.run b/run/scip.run index 747cd33..a2d6af5 100644 --- a/run/scip.run +++ b/run/scip.run @@ -38,7 +38,7 @@ build_boot_image { stdcxx.lib.so soplex.lib.so zlib.lib.so gmp.lib.so scip.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "child \"test-scip\" exited with exit value 0" 20 diff --git a/run/soplex.run b/run/soplex.run index e0036f5..0854868 100644 --- a/run/soplex.run +++ b/run/soplex.run @@ -35,7 +35,7 @@ build_boot_image { stdcxx.lib.so soplex.lib.so zlib.lib.so gmp.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "child \"test-soplex\" exited with exit value 0" 20 diff --git a/run/sqlite_speedtest.run b/run/sqlite_speedtest.run index a5f9eb7..7314088 100644 --- a/run/sqlite_speedtest.run +++ b/run/sqlite_speedtest.run @@ -45,7 +45,7 @@ build_boot_image { timer } -append qemu_args " -nographic -m 128 " +append qemu_args " -nographic " run_genode_until {.*child "test-sqlite_speedtest" exited with exit value 0.*} 600 diff --git a/run/superbossgaiden.run b/run/superbossgaiden.run index ff35f45..24ce96a 100644 --- a/run/superbossgaiden.run +++ b/run/superbossgaiden.run @@ -203,6 +203,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/tyrian.run b/run/tyrian.run index 6776333..4e068f3 100644 --- a/run/tyrian.run +++ b/run/tyrian.run @@ -147,6 +147,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/tyrquake.run b/run/tyrquake.run index 6844078..d90a287 100644 --- a/run/tyrquake.run +++ b/run/tyrquake.run @@ -229,7 +229,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/uhexen2.run b/run/uhexen2.run index 76a6dcc..31e53e2 100644 --- a/run/uhexen2.run +++ b/run/uhexen2.run @@ -200,6 +200,6 @@ lappend_if [have_spec pl11x] boot_modules fb_drv build_boot_image $boot_modules -append qemu_args " -m 512 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/run/usb_gamepad_input.run b/run/usb_gamepad_input.run index 757c021..b52f671 100644 --- a/run/usb_gamepad_input.run +++ b/run/usb_gamepad_input.run @@ -144,7 +144,7 @@ build_boot_image $boot_modules # # Qemu opts for EHCI # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append qemu_args " -usb -usbdevice host:$usb_raw_device " append qemu_args " -device usb-ehci,id=ehci "