Merge branch 'misc-cleanup-and-debug' into master

Makefile

@@ -213,7 +213,7 @@ ${bld}/os.32k: example-os/os.asm ${bld}/check_makefile
 	nasm -w+macro-params -w+macro-selfref -w+orphan-labels -w+gnu-elf-extensions -o $@ $<
 
 # Circumvent the fact that faketime does not work on system binaries in macos
-./utils/mkisofs ./utils/mformat ./utils/mcopy: Makefile	# TODO: depend on the mkisofs binary
+./utils/mkisofs ./utils/mformat ./utils/mcopy: ${bld}/check_makefile # TODO: depend on the mkisofs binary
 	cp $$(which $$(basename $@)) $@
 	chmod u+x $@
 
@@ -511,6 +511,19 @@ test/requiring_sudo: ${tests_requiring_sudo:test/%=${bld}/test_pass/sudo_%} ${bl
 # check that the fat filesystem can be mounted and has the correct contents
 ${bld}/test_pass/sudo_fat12_mount: ${os_filename} ${dep_bytes_fat12_start} ${bld}/check_makefile | ${bld}/mnt_fat12
 	sudo umount ${bld}/mnt_fat12 || true
+	# debug failure to mount the FAT12 filesystem
+	(set -x                                           ;\
+	grep '^' ${bld}/offsets/*                                                       ;\
+	(sudo mount -o loop,ro,offset=${bytes_fat12_start} $< ${bld}/mnt_fat12) || true ;\
+	dmesg | tail                                                                    ;\
+	ls -l ${bld}/mnt_fat12 | (grep os.zip || true)                                  ;\
+	sudo umount ${bld}/mnt_fat12 || true                                            ;\
+	sleep 10                                                                        ;\
+	cat ${os_filename} | xz | base64                                                ;\
+	(sudo mount -o loop,ro,offset=${bytes_fat12_start} $< ${bld}/mnt_fat12) || true ;\
+	sudo umount ${bld}/mnt_fat12 || true                                            ;\
+	) > debug-fat12.log 2>&1
+	cat debug-fat12.log
 	sudo mount -o loop,ro,offset=${bytes_fat12_start} $< ${bld}/mnt_fat12
 	ls -l ${bld}/mnt_fat12 | grep os.zip
 	sudo umount ${bld}/mnt_fat12
@@ -518,12 +531,19 @@ ${bld}/test_pass/sudo_fat12_mount: ${os_filename} ${dep_bytes_fat12_start} ${bld
 
 ${bld}/test_pass/sudo_iso_mount: ${os_filename} ${bld}/check_makefile | ${bld}/mnt_iso
 	sudo umount ${bld}/mnt_iso || true
-	grep '^' ${bld}/offsets/* # debug failure to mount the ISO9660 filesystem
+	# debug failure to mount the ISO9660 filesystem
-	(sudo mount -o loop,ro $< ${bld}/mnt_iso) || true
+	(set -x                                           ;\
-	dmesg | tail # debug failure to mount the ISO9660 filesystem
+	grep '^' ${bld}/offsets/*                         ;\
-	hexdump -C ${os_filename}
+	(sudo mount -o loop,ro $< ${bld}/mnt_iso) || true ;\
-	ls -l ${bld}/mnt_iso | grep os.zip
+	dmesg | tail                                      ;\
-	sudo umount ${bld}/mnt_iso
+	cat ${os_filename} | xz | base64                  ;\
+	ls -l ${bld}/mnt_iso | grep os.zip                ;\
+	sudo umount ${bld}/mnt_iso || true                ;\
+	sleep 11                                          ;\
+	(sudo mount -o loop,ro $< ${bld}/mnt_iso) || true ;\
+	sudo umount ${bld}/mnt_iso || true                ;\
+	) > debug-iso.log 2>&1
+	cat debug-iso.log
 	sudo mount -o loop,ro $< ${bld}/mnt_iso
 	sudo umount ${bld}/mnt_iso
 	touch $@

test/bochs.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 os_filename="$1"
 

test/dosbox.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 os_filename="$1"
 

test/gui-sh-mac.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 # Force the path to be relative or absolute, but with at least one /
 # Otherwise, the command will be searched in the $PATH, instead of using the

test/gui-sh.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 # Force the path to be relative or absolute, but with at least one /
 # Otherwise, the command will be searched in the $PATH, instead of using the

test/qemu-system-i386-cdrom.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 os_filename="$1"
 

test/qemu-system-i386-floppy.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 os_filename="$1"
 

test/virtualbox.sh

@@ -3,6 +3,7 @@ set -e
 
 if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
     echo "Usage: $0 operating_system_file"
+    exit 1
 fi
 os_filename="$1"
 

utils/install-sikulix.sh

@@ -5,5 +5,5 @@ set -e
 # The sikuli-ide packaged with ubuntu 16.04 does not seem to work correctly: missing dependencies, some dependencies are too recent, …
 mkdir ~/sikulix/
 wget https://launchpad.net/sikuli/sikulix/1.1.3/+download/sikulixsetup-1.1.3.jar -O ~/sikulix/sikulixsetup-1.1.3.jar
-(cd ~/sikulix && java -jar sikulixsetup-1.1.3.jar options 1 1.1)
+(cd ~/sikulix && java -jar sikulixsetup-1.1.3.jar options 1 1.1) || (cat ~/sikulix/SikuliX-1.1.3-SetupLog.txt; exit 1)
 echo 'export PATH="$HOME/sikulix/:$PATH"'