diff -r aba6b8104af3 -r 84a16765cd86 installationservices/swi/test/testexes/prepareexes.pl --- a/installationservices/swi/test/testexes/prepareexes.pl Tue Feb 02 00:20:15 2010 +0200 +++ b/installationservices/swi/test/testexes/prepareexes.pl Fri Mar 19 09:33:35 2010 +0200 @@ -40,6 +40,7 @@ my $configuration = lc($ARGV[1]); my $packagedir = "packages"; my $non_iby_packagedir = "non_iby_packages"; +my $packages_interpretsis_testcase = "packages_interpretsis_testcase"; my $builddir = "buildsis_${platform}_${configuration}"; usage() if $opt{h}; @@ -121,7 +122,7 @@ my ($file, $data) = @_; # Ensure directory exists - if ($file =~ basename($1) && ! -e $1) { + if ($1 && $file =~ basename($1) && ! -e $1) { mkdir($1); } @@ -149,6 +150,8 @@ print "Processing files in directory: $builddir\n\n"; MakeSISFiles($packagedir,"yes"); MakeSISFiles($non_iby_packagedir,"no"); +MakeSISFiles($packages_interpretsis_testcase,"yes"); + # Copy emulator version of preinstalled exes to location script expects. # They will be moved by the test script to the e: drive. @@ -791,6 +794,9 @@ # non-removable test SignFileWithSpecifiedCert("nonremovablebase.sis", "nonremovablebase_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby); +SignFileWithSpecifiedCert("int_nr_option_04.sis", "int_nr_option_04_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby); +SignFileWithSpecifiedCert("int_nr_option_05.sis", "int_nr_option_05_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby); +SignFileWithSpecifiedCert("sp_int_nr_option_06.sis", "sp_int_nr_option_06_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby); SignFile("romupgrademorecapsthansucert_sucert.sis", "romupgrademorecapsthansucert_sucert_root5.sis", "root5ca", \*iby);