diff options
Diffstat (limited to 't_install_iso/010_check_autorun.t')
| -rw-r--r-- | t_install_iso/010_check_autorun.t | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/t_install_iso/010_check_autorun.t b/t_install_iso/010_check_autorun.t index af8f4b9..ce6000a 100644 --- a/t_install_iso/010_check_autorun.t +++ b/t_install_iso/010_check_autorun.t @@ -30,20 +30,18 @@ my $name = basename($image_path); bail_on_fail; -set_failure_handler( sub { +set_failure_handler(sub { print "umount iso\n"; system 'umount /media/iso_check; rm -r /media/iso_check'; }); -# Autorun is on CD AND DVD -#my %info = Tools::parse_mageia_iso_name($name); -#skip 'Autorun is only on DVDs.', 13 unless $info{"medium"} eq 'DVD'; - # -ok (-r "/media/iso_check/autorun.inf", 'autorun.inf is there'); +ok -r "/media/iso_check/autorun.inf", 'autorun.inf is there'; BAIL_OUT('Autorun stuff is missing anyway.') if !(-r "/media/iso_check/autorun.inf"); +# TODO check media name in autorun.inf (for Windows) + # my $lines = `cat -e /media/iso_check/autorun.inf | wc -l`; my $num = `cat -e /media/iso_check/autorun.inf | grep "\\^M" | wc -l`; @@ -52,9 +50,9 @@ chomp($lines); my $last = `cat -e /media/iso_check/autorun.inf | tail -n 1 | grep "\\^M" | wc -l`; # TODO rewrite this -if ( ($lines != $num && $lines - 1 != $num) - || ($lines == 0) - || ($lines -1 == $num && $last == 1)) { +if ($lines != $num && $lines - 1 != $num + || $lines == 0 + || $lines - 1 == $num && $last == 1) { fail('autorun.inf valid EOL chars'); } else { pass('autorun.inf valid EOL chars'); |