From e8dd8c057b18e7a47a389c3144e9bce948862a84 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Mon, 7 Oct 2024 18:59:57 -0700
Subject: [PATCH] Fix paths

---
 python_files/testing_tools/adapter/util.py           |  6 ++++++
 .../tests/testing_tools/adapter/test_util.py         | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/python_files/testing_tools/adapter/util.py b/python_files/testing_tools/adapter/util.py
index 52c0fac757f8..56e3ebf9b1ae 100644
--- a/python_files/testing_tools/adapter/util.py
+++ b/python_files/testing_tools/adapter/util.py
@@ -102,6 +102,12 @@ def _resolve_relpath(
     if path.startswith("./"):
         return path[2:]
     if not _path_isabs(path):
+        if rootdir:
+            rootdir = rootdir.replace(_pathsep, "/")
+            if not rootdir.endswith("/"):
+                rootdir += "/"
+            if _normcase(path).startswith(_normcase(rootdir)):
+                return path[len(rootdir) :]
         return path
 
     # Deal with root-dir-as-fileid.
diff --git a/python_files/tests/testing_tools/adapter/test_util.py b/python_files/tests/testing_tools/adapter/test_util.py
index 50f089361f0a..295de15f0369 100644
--- a/python_files/tests/testing_tools/adapter/test_util.py
+++ b/python_files/tests/testing_tools/adapter/test_util.py
@@ -124,7 +124,7 @@ def test_fix_path(path, expected):
         # absolute
         ("/", posixpath, "/"),
         ("/spam.py", posixpath, "/spam.py"),
-        ("\\", ntpath, ".\\" if is_python313_or_later() else "\\"),
+        ("\\", ntpath, ".\\\\" if is_python313_or_later() else "\\"),
         (r"\spam.py", ntpath, r".\\spam.py" if is_python313_or_later() else r"\spam.py"),
         (r"C:\spam.py", ntpath, r"C:\spam.py"),
         # no-op
@@ -225,11 +225,11 @@ def test_fix_fileid(fileid, os_path, expected):
         ("/eggs/spam.py", "/eggs", ntpath, "./spam.py"),
         ("/eggs/spam.py", "/eggs/", ntpath, "./spam.py"),
         # no-op
-        ("/spam.py", "/eggs", ntpath, "/spam.py"),
-        ("/spam.py", "/eggs/", ntpath, "/spam.py"),
+        ("/spam.py", "/eggs", ntpath, ".//spam.py" if is_python313_or_later() else "/spam.py"),
+        ("/spam.py", "/eggs/", ntpath, ".//spam.py" if is_python313_or_later() else "/spam.py"),
         # root-only (no-op)
         ("/", "/", ntpath, "/"),
-        ("/", "/spam", ntpath, "/"),
+        ("/", "/spam", ntpath, ".//" if is_python313_or_later() else "/"),
         ("//", "/", ntpath, "//"),
         ("//", "//", ntpath, "//"),
         ("//", "//spam", ntpath, "//"),
@@ -244,11 +244,11 @@ def test_fix_fileid(fileid, os_path, expected):
         (r"\eggs\spam.py", "\\Eggs", ntpath, r"./spam.py"),
         (r"\eggs\Spam.py", "\\Eggs", ntpath, r"./Spam.py"),
         # no-op
-        (r"\spam.py", r"\eggs", ntpath, r"/spam.py"),
+        (r"\spam.py", r"\eggs", ntpath, ".//spam.py" if is_python313_or_later() else r"/spam.py"),
         (r"C:\spam.py", r"C:\eggs", ntpath, r"C:/spam.py"),
         # TODO: Should these be supported.
         (r"C:\spam.py", "\\", ntpath, r"C:/spam.py"),
-        (r"\spam.py", "C:\\", ntpath, r"/spam.py"),
+        (r"\spam.py", "C:\\", ntpath, ".//spam.py" if is_python313_or_later() else r"/spam.py"),
         # root-only
         ("\\", "\\", ntpath, "/"),
         ("\\\\", "\\", ntpath, "//"),