Update changelog for 20220425 release

[novaboot.git] / tests / novaboot.wv

diff --git a/tests/novaboot.wv b/tests/novaboot.wv
index d7e35c77ae24d9c586abdda980f5dded7efc0201..453bb19afb474a28e0370319d31be7beb7d79aef 100755 (executable)
--- a/tests/novaboot.wv
+++ b/tests/novaboot.wv
@@ -26,6 +26,33 @@ EOF
 WVPASS ./script --gen-only --pulsar
 WVPASS grep "chld grub" config-novaboot
 
+WVSTART GRUB2 with default BOOT_METHOD=multiboot
+create_script <<EOF
+load kernel
+load ramdisk
+EOF
+WVPASS ./script --gen-only --grub2
+WVPASS git diff --no-index --color - boot/grub/grub.cfg <<EOF
+menuentry script {
+  multiboot kernel 
+  module ramdisk ramdisk
+}
+EOF
+
+WVSTART GRUB2 with BOOT_METHOD=linux
+create_script <<EOF
+BOOT_METHOD=linux
+load kernel
+load ramdisk
+EOF
+WVPASS ./script --gen-only --grub2
+WVPASS git diff --no-index --color - boot/grub/grub.cfg <<EOF
+menuentry script {
+  linux kernel 
+  initrd ramdisk
+}
+EOF
+
 WVSTART Configuration files
 create_dummy
 echo '1;' > .novaboot
@@ -123,7 +150,7 @@ WVPASSSH 'NOVABOOT_TARGET=t2 novaboot --target t3 /dev/null'
 WVPASS test "$(cat t)" = Target3
 
 WVSTART --iprelay-cmd
-WVPASS novaboot --iprelay-cmd="echo -e '<iprelayd: connected>\xFF\xFA\x2C\x97\xDF\xFF\xF0 \xFF\xFA\x2C\x97\xFF\xFF\xF0'" --on
+WVPASS novaboot --iprelay-cmd="$(which echo) -e '<iprelayd: connected>\xFF\xFA\x2C\x97\xDF\xFF\xF0 \xFF\xFA\x2C\x97\xFF\xFF\xF0'" --on
 
 WVSTART Killing of --remote-cmd when it ignores SIGHUP
 WVPASS tee script <<'EOF'