Skip to content

Commit

Permalink
[test] fix mingw test issues with \r\n
Browse files Browse the repository at this point in the history
  • Loading branch information
Reini Urban committed Oct 5, 2014
1 parent 4176098 commit 24f2988
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions t/run/debugger_options.t
@@ -1,5 +1,5 @@
#!perl
# Copyright (C) 2005-2013, Parrot Foundation.
# Copyright (C) 2005-2014, Parrot Foundation.

=head1 NAME
Expand Down Expand Up @@ -27,7 +27,7 @@ my $PARROT_DEBUGGER = ".$PConfig{slash}parrot_debugger";

# looking at the no flag arguments error message
my ( $stdout, $stderr, $success ) = qxx( "$PARROT_DEBUGGER --help" );
is( $stderr, "parrot_debugger takes no -x or --xxxx flag arguments\n",
is( $stderr, "parrot_debugger takes no -x or --xxxx flag arguments\r?\n",
'Debugger flag argument error message' );

# Local Variables:
Expand Down
4 changes: 3 additions & 1 deletion t/run/options.t
@@ -1,5 +1,5 @@
#!perl
# Copyright (C) 2005-2010, Parrot Foundation.
# Copyright (C) 2005-2014, Parrot Foundation.

=head1 NAME
Expand All @@ -21,6 +21,7 @@ use lib qw( lib . ../lib ../../lib );

use Test::More tests => 40;
use Parrot::Config;
use Parrot::Test qw(convert_line_endings);
use File::Temp 0.13 qw/tempfile/;
use File::Spec;

Expand Down Expand Up @@ -59,6 +60,7 @@ say "first"
.end
END_PIR
convert_line_endings($expected_preprocesses_pir);
is( `"$PARROT" -E "$first_pir_file" $redir`, $expected_preprocesses_pir, 'option -E' );
is( `"$PARROT" --pre-process-only "$first_pir_file" $redir`,
$expected_preprocesses_pir, 'option --pre-process-only' );
Expand Down

0 comments on commit 24f2988

Please sign in to comment.