www

commit c8806b151e9827ae9941aa5125f521b1bc6bf015
parent 925d0d787b547c509fa99c8cb67611994d32fa95
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Sat, 30 Jun 2018 16:56:39 +0200

Remove temporary files upon success (still to do: make sure they are also removed on failure)

Diffstat:
M
test/bochs.sh
 | 
2
++
M
test/virtualbox.sh
 | 
6
++++--
M
utils/ansi-screenshots/ansi_screenshot.sh
 | 
2
++
M
utils/ansi-screenshots/to_ansi.sh
 | 
2
++

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/test/bochs.sh b/test/bochs.sh
@@ -20,3 +20,5 @@ runsikulix -r test/check-gradient.sikuli
 ./utils/take-screenshots.sh "$(basename "$0" .sh).png"
 
 kill $pid
+
+rm "${bochsrc}" "${bochscontinue}"
diff --git a/test/virtualbox.sh b/test/virtualbox.sh
@@ -3,11 +3,11 @@ set -e
 
 os_file="example-os/os.sh"
 img_file="$(mktemp --suffix=".img")"
-vbox_dir="vbox_$(date +%s)-$$"
+vbox_dir="$(mktemp -d --prefix vbox_)"
 vmname="automatic-os-test-$(date +%s)-$$"
 
 ln -sf "$(readlink -f "$os_file")" "$img_file"
-VBoxManage createvm --name "$vmname" --register --basefolder "/tmp/$vbox_dir"
+VBoxManage createvm --name "$vmname" --register --basefolder "$vbox_dir"
 VBoxManage modifyvm "$vmname" --hwvirtex off
 VBoxManage modifyvm "$vmname" --nestedpaging off
 VBoxManage modifyvm "$vmname" --pae off
@@ -29,5 +29,7 @@ for i in `seq 10`; do
     fi
     sleep 0.1
 done
+
+# Cleanup: remove temporary files and directories.
 rm "$img_file"
 rm "/tmp/$vbox_dir" -fr
diff --git a/utils/ansi-screenshots/ansi_screenshot.sh b/utils/ansi-screenshots/ansi_screenshot.sh
@@ -4,3 +4,5 @@ screenshot="$(mktemp --suffix=".png")"
 
 scrot "$screenshot"
 "$(dirname "$0")/to_ansi.sh" "$screenshot" 107
+
+rm "$screenshot"
diff --git a/utils/ansi-screenshots/to_ansi.sh b/utils/ansi-screenshots/to_ansi.sh
@@ -42,3 +42,5 @@ paste "$odd_lines_px" "$even_lines_px" \
  | sed -r -e 's/([01])([0-7]) ([01])([0-7]) /[\1;3\2;4\4m▀/g' -e 's/$//' \
  | if test "$CI" = "true" -a "$TRAVIS" = "true"; then while IFS=$'\n' read -n 11 ab; do if test "${#ab}" -ne 11; then echo "$ab"; else echo -n "$ab"; fi; sleep 0.01; done; else cat; fi
 echo
+
+rm "${mini_png}" "${colors_gif}" "${indexed_gif}" "${indexed_pgm}" "${odd_lines}" "${even_lines}" "${odd_lines_px}" "${even_lines_px}"