ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: create a common cygpath function to ease future test

This commit is contained in:
Gregory Hainaut 2016-01-24 15:21:47 +01:00
parent 5a20d629ab
commit e985488471
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/run_test.pl
View File

@ -131,10 +131,7 @@ unless (-d $o_cfg) {
# $o_cygwin = 1; # $o_cygwin = 1;
#} #}
if ($o_cygwin) { $o_cfg = cyg_abs_path($o_cfg);
$o_cfg = `cygpath -w $o_cfg`;
chomp($o_cfg);
}
my %blacklist; my %blacklist;
if (defined $o_regression) { if (defined $o_regression) {
@ -215,6 +212,17 @@ print "\n";
##################################################### #####################################################
# Sub helper # Sub helper
##################################################### #####################################################
sub cyg_abs_path {
my $p = shift;
my $ap = abs_path($o_suite);
if ($o_cygwin) {
$ap = `cygpath -w $ap`;
chomp($ap);
$ap =~ s/\\/\\\\/g;
}
return $ap;
}
sub collect_result { sub collect_result {
foreach my $test (keys(%$g_test_db)) { foreach my $test (keys(%$g_test_db)) {
my $info = $g_test_db->{$test}; my $info = $g_test_db->{$test};
@ -260,19 +268,11 @@ sub run_thread {
sub generate_cfg { sub generate_cfg {
my $out_dir = shift; my $out_dir = shift;
my $win_out_dir = $out_dir; $out_dir = cyg_abs_path($out_dir);
if ($o_cygwin) {
$win_out_dir = `cygpath -w $win_out_dir`;
chomp($win_out_dir);
}
print "Info: Copy dir $o_cfg to $win_out_dir\n" if $o_debug_me; print "Info: Copy dir $o_cfg to $out_dir\n" if $o_debug_me;
local $File::Copy::Recursive::RMTrgDir = 2; local $File::Copy::Recursive::RMTrgDir = 2;
dircopy($o_cfg, $win_out_dir) or die "Failed to copy directory: $!\n"; dircopy($o_cfg, $out_dir) or die "Failed to copy directory: $!\n";
# Enable the logging to get the trace log
my $ui_ini = File::Spec->catfile($out_dir, "PCSX2_ui.ini");
my $vm_ini = File::Spec->catfile($out_dir, "PCSX2_vm.ini");
my %sed; my %sed;
# Enable logging for test # Enable logging for test
@ -352,12 +352,8 @@ sub test_cmd {
my $elf = shift; my $elf = shift;
my $cfg = shift; my $cfg = shift;
if ($o_cygwin) { $elf = cyg_abs_path($elf);
$elf = `cygpath -w $elf`; $cfg = cyg_abs_path($cfg);
$cfg = `cygpath -w $cfg`;
chomp($elf);
chomp($cfg);
}
if ($elf =~ /\.elf/) { if ($elf =~ /\.elf/) {
return "$o_exe --elf $elf --cfgpath=$cfg" return "$o_exe --elf $elf --cfgpath=$cfg"