File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -225,7 +225,9 @@ sub runtest {
225
225
#
226
226
if ($^O eq ' MSWin32' ) {
227
227
my $winoutput = File::Spec-> canonpath($output );
228
- $r = system " fc /lb1000 /t /1 $winoutput tests\\ NEW\\ $outputbase >tests\\ DIFF\\ $outputbase .diff" ;
228
+ my $winnewdir = File::Spec-> canonpath($newdir );
229
+ my $windiffdir = File::Spec-> canonpath($diffdir );
230
+ $r = system " fc /lb1000 /t /1 $winoutput ${winnewdir} \\ $outputbase >${windiffdir} \\ $outputbase .diff" ;
229
231
$diffstat = $r >> 8;
230
232
} else {
231
233
$r = system " diff $diff_flags $output ${newdir} /$outputbase >${diffdir} /$outputbase .diff" ;
@@ -257,8 +259,9 @@ sub runtest {
257
259
#
258
260
if ($^O eq ' MSWin32' ) {
259
261
my $winoutput = File::Spec-> canonpath($output );
262
+ my $windiffdir = File::Spec-> canonpath($diffdir );
260
263
my $canonstderrlog = File::Spec-> canonpath($stderrlog );
261
- $nr = system " fc /lb1000 /t /1 $winoutput .stderr $canonstderrlog >tests \D IFF \$ outputbase.stderr.diff" ;
264
+ $nr = system " fc /lb1000 /t /1 $winoutput .stderr $canonstderrlog >${windiffdir} \ \$outputbase .stderr.diff" ;
262
265
$errdiffstat = $nr >> 8;
263
266
} else {
264
267
$nr = system " diff $output .stderr $stderrlog >${diffdir} /$outputbase .stderr.diff" ;
@@ -299,7 +302,8 @@ sub runtest {
299
302
# XXX - just do this directly in Perl?
300
303
#
301
304
if ($^O eq ' MSWin32' ) {
302
- system " type tests\\ DIFF\\ $outputbase .diff >> tests\\ failure-outputs.txt" ;
305
+ my $windiffdir = File::Spec-> canonpath($diffdir );
306
+ system " type ${windiffdir} \\ $outputbase .diff >> tests\\ failure-outputs.txt" ;
303
307
} else {
304
308
system " cat ${diffdir} /$outputbase .diff >> tests/failure-outputs.txt" ;
305
309
}
You can’t perform that action at this time.
0 commit comments