From patchwork Sun Oct 29 05:09:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4,of,4] test-static-http: fix broken path sorting on Windows From: Matt Harbison X-Patchwork-Id: 25306 Message-Id: <8f5cbf8bdf417a1f3c23.1509253785@Envy> To: mercurial-devel@mercurial-scm.org Date: Sun, 29 Oct 2017 01:09:45 -0400 # HG changeset patch # User Matt Harbison # Date 1509249192 14400 # Sat Oct 28 23:53:12 2017 -0400 # Branch stable # Node ID 8f5cbf8bdf417a1f3c23a790b610aa9d408332a5 # Parent ba57926f2b4ccc2ded732b60c7da40544d524eb3 test-static-http: fix broken path sorting on Windows Some of the paths output had '\', throwing off the order. Globbing in the test didn't help, because `sort` sees the pre-globbed path. diff --git a/tests/test-static-http.t b/tests/test-static-http.t --- a/tests/test-static-http.t +++ b/tests/test-static-http.t @@ -218,7 +218,7 @@ List of files accessed over HTTP: - $ cat server.log | sed -n -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u + $ cat server.log | sed -n -e 's|\\|/|g' -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u /.hg/bookmarks /.hg/bookmarks.current /.hg/cache/hgtagsfnodes1