summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-01-27 17:19:56 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-28 13:35:56 -0800
commitd53c2c67380f769f91fd45cc8c63a5883245ccca (patch)
tree620990a4783f08344e9d33cf04e98be229124247
parentmingw: skip test in t1508 that fails due to path conversion (diff)
downloadtgif-d53c2c67380f769f91fd45cc8c63a5883245ccca.tar.xz
mingw: fix t9700's assumption about directory separators
This test assumed that there is only one directory separator (the forward slash), not two equivalent directory separators. However, on Windows, the back slash and the forward slash *are* equivalent. Let's paper over this issue by converting the backward slashes to forward ones in the test that fails with MSYS2 otherwise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9700/test.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index 1140767b50..7e8c40b97b 100755
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -33,7 +33,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"), $r->config("test.pathexpanded"),
+is($r->config_path("test.path") =~ s/\\/\//gr, $r->config("test.pathexpanded"),
"config_path: ~/foo expansion");
is_deeply([$r->config_path("test.pathmulti")], ["foo", "bar"],
"config_path: multiple values");