diff options
| author | Jeff King <peff@peff.net> | 2016-03-04 06:43:21 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 10:14:30 -0800 |
| commit | 839b6397be260592f5afd193279c5dbfb99ce093 (patch) | |
| tree | 0fca3579e2cd1ecfe3eb93fa9ebe6c8a10e8e25c /t/t9700 | |
| parent | 80ce6c25a4289835e197004a54ca75401bea55dc (diff) | |
| download | git-839b6397be260592f5afd193279c5dbfb99ce093.tar.gz git-839b6397be260592f5afd193279c5dbfb99ce093.tar.xz | |
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>
Diffstat (limited to 't/t9700')
| -rwxr-xr-x | t/t9700/test.pl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t9700/test.pl b/t/t9700/test.pl index 7e8c40b97..1b75c9196 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -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 @@ is($r->config_int("test.int"), 2048, "config_int: integer"); 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"); |