From 00ffd8d66da9a426b9be192b3311bafa1ab76332 Mon Sep 17 00:00:00 2001 From: Damien Lallement Date: Fri, 9 Dec 2011 01:03:54 +0000 Subject: - update README - remove 'mono' as a dependance - remove the 'mono' test for 'autorun' as it was useless - update/fix some 'FIXME' - update DVD/CD test size with better values - update 'badwords' and 'temp files' check --- t_install_iso/010_check_autorun.t | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) (limited to 't_install_iso/010_check_autorun.t') diff --git a/t_install_iso/010_check_autorun.t b/t_install_iso/010_check_autorun.t index 757951e..1ae45e0 100644 --- a/t_install_iso/010_check_autorun.t +++ b/t_install_iso/010_check_autorun.t @@ -1,7 +1,7 @@ # # Check autorun # -use Test::Most tests => 13; +use Test::Most tests => 12; use File::Basename; use Tools; @@ -16,8 +16,9 @@ set_failure_handler( sub { system 'umount /media/iso_check; rm -r /media/iso_check'; }); -my %info = Tools::parse_mageia_iso_name($name); -skip 'Autorun is only on DVDs.', 13 unless $info{"medium"} eq 'DVD'; +# 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'); @@ -63,32 +64,4 @@ foreach my $a ("de-DE/", "es-ES/", "fr-FR/", "it-IT/", "pt-BR/", "ru-RU/", "zh-C ok -r $file, "$file is there"; } -# FIXME what does this do? does it work? -# in the meantime, skipped -SKIP: { - skip 'Not clear what this does', 1 unless 0; - - my $_cp = `cp $exe .`; - eval { - local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required - alarm 5; - my $_nread = sysread my $_SOCKET, my $_buffer, my $_size; - my $_mono = `mono autorun.exe 2> autorun_exe.log`; - alarm 0; - if ($@) { - die unless $@ eq "alarm\n"; # propagate unexpected errors - # timed out - } else { - # didn't - } - }; - - open(my $exe_log, 'autorun_exe.log'); - my $line = <$exe_log>; - - isnt (substr($line, 0, 20), 'Cannot open assembly', 'autorun.exe is launchable'); - - my $_rm = `rm autorun.exe autorun_exe.log`; -} - done_testing(); -- cgit v1.2.1