mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-06 10:16:12 +02:00
Code

t9700: fix test for perl older than 5.14 

Commit d53c2c6 (mingw: fix t9700's assumption about
directory separators, 2016-01-27) uses perl's "/r" regex
modifier to do a non-destructive replacement on a string,
leaving the original unmodified and returning the result.

This feature was introduced in perl 5.14, but systems with
older perl are still common (e.g., CentOS 6.5 still has perl
5.10). Let's work around it by providing a helper function
that does the same thing using older syntax.

While we're at it, let's switch to using an alternate regex
separator, which is slightly more readable.

Reported-by: Christian Couder <christian.couder@gmail.com>
Helped-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2016-03-04 06:43:21 -05:00 committed by Junio C Hamano
parent 80ce6c25a4
commit 839b6397be
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t9700/test.pl
View File

@ -17,6 +17,12 @@ BEGIN
use Cwd;
use File::Basename;
sub adjust_dirsep {
my $path = shift;
$path =~ s{\\}{/}g;
return $path;
}
BEGIN { use_ok('Git') }
# set up
@ -33,7 +39,7 @@ BEGIN
is($r->config_int("test.nonexistent"), undef, "config_int: nonexistent");
ok($r->config_bool("test.booltrue"), "config_bool: true");
ok(!$r->config_bool("test.boolfalse"), "config_bool: false");
is($r->config_path("test.path") =~ s/\\/\//gr, $r->config("test.pathexpanded"),
is(adjust_dirsep($r->config_path("test.path")), $r->config("test.pathexpanded"),
"config_path: ~/foo expansion");
is_deeply([$r->config_path("test.pathmulti")], ["foo", "bar"],
"config_path: multiple values");