tests: disable spu sound in test

Avoid spurious alsa error message
This commit is contained in:
Gregory Hainaut 2016-01-30 12:39:17 +01:00
parent 2ffdbe781f
commit 91e46a94f5
1 changed files with 13 additions and 8 deletions

View File

@ -154,13 +154,11 @@ if ($o_regression or $o_bad) {
$blacklist{"arithmetic"} = 1; $blacklist{"arithmetic"} = 1;
$blacklist{"branchdelay"} = 1; $blacklist{"branchdelay"} = 1;
$blacklist{"compare"} = 1; $blacklist{"compare"} = 1;
$blacklist{"fcr"} = 1;
$blacklist{"muldiv"} = 1; $blacklist{"muldiv"} = 1;
$blacklist{"sqrt"} = 1; $blacklist{"sqrt"} = 1;
# IOP # IOP
$blacklist{"lsudelay"} = 1; $blacklist{"lsudelay"} = 1;
# Dma vif
$blacklist{"stmod"} = 1;
$blacklist{"stcycl"} = 1;
# Kernel IOP # Kernel IOP
$blacklist{"register"} = 1; $blacklist{"register"} = 1;
$blacklist{"receive"} = 1; $blacklist{"receive"} = 1;
@ -346,24 +344,31 @@ sub generate_cfg {
$sed{$k} = $v; $sed{$k} = $v;
} }
tie my @ui, 'Tie::File', File::Spec->catfile($out_dir, "PCSX2_ui.ini") or die "Fail to tie PCSX2_ui.ini $!\n"; tie my @ui, 'Tie::File', File::Spec->catfile($out_dir, "PCSX2_ui.ini") or die "Fail to tie $!\n";
tie my @vm, 'Tie::File', File::Spec->catfile($out_dir, "PCSX2_vm.ini") or die "Fail to tie PCSX2_vm.ini $!\n";
for (@ui) { for (@ui) {
foreach my $option (keys(%sed)) { foreach my $option (keys(%sed)) {
my $v = $sed{$option}; my $v = $sed{$option};
s/$option=.*/$option=$v/; s/$option=.*/$option=$v/;
} }
} }
untie @ui;
tie my @vm, 'Tie::File', File::Spec->catfile($out_dir, "PCSX2_vm.ini") or die "Fail to tie $!\n";
for (@vm) { for (@vm) {
foreach my $option (keys(%sed)) { foreach my $option (keys(%sed)) {
my $v = $sed{$option}; my $v = $sed{$option};
s/$option=.*/$option=$v/; s/$option=.*/$option=$v/;
} }
} }
untie @ui;
untie @vm; untie @vm;
# Disable sound emulation (avoid spurious "ALSA lib pcm.c:7843:(snd_pcm_recover) underrun occurred")
tie my @spu, 'Tie::File', File::Spec->catfile($out_dir, "spu2-x.ini") or die "Fail to tie $!\n";
for (@spu) {
s/Output_Module=.*/Output_Module=nullout/;
}
untie @spu;
} }
sub run_elf { sub run_elf {