From 05e1a61d6ca97b6d24074faa416544be26a9ce50 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 9 Dec 2013 19:53:47 -0800
Subject: [PATCH] Issue #2150623 by dawehner, pwolanin, rfay: Subdirectory +
 Clean URLs failure: 6.x-3.x PIFR: 3 Failures in D8 test.

---
 core/scripts/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index ef51d8acf77e..e9f0ffe6462c 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -295,7 +295,7 @@ function simpletest_script_init($server_software) {
   if (!empty($args['url'])) {
     $parsed_url = parse_url($args['url']);
     $host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
-    $path = isset($parsed_url['path']) ? rtrim($parsed_url['path']) : '';
+    $path = isset($parsed_url['path']) ? rtrim(rtrim($parsed_url['path']), '/') : '';
     $port = (isset($parsed_url['port']) ? $parsed_url['port'] : $port);
     if ($path == '/') {
       $path = '';
-- 
GitLab