4 files changed, 33 insertions, 4 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index 7cf303631..7dde38ae6 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -670,8 +670,12 @@ SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSe
 
 int main(int argc, char**  argv)
 {
+    using namespace Slang;
     SlangSession* session = spCreateSession(nullptr);
-    SlangResult res = innerMain(Slang::StdWriters::initDefault(), session, argc, argv);
+
+    auto stdWriters = StdWriters::initDefaultSingleton();
+    
+    SlangResult res = innerMain(stdWriters, session, argc, argv);
     spDestroySession(session);
 
 	return SLANG_FAILED(res) ? 1 : 0;
diff --git a/tools/slang-reflection-test/slang-reflection-test-main.cpp b/tools/slang-reflection-test/slang-reflection-test-main.cpp
index 3ae614b22..209528927 100644
--- a/tools/slang-reflection-test/slang-reflection-test-main.cpp
+++ b/tools/slang-reflection-test/slang-reflection-test-main.cpp
@@ -963,8 +963,13 @@ int main(
     int argc,
     char** argv)
 {
+    using namespace Slang;
+
     SlangSession* session = spCreateSession(nullptr);
-    SlangResult res = innerMain(Slang::StdWriters::initDefault(), session, argc, argv);
+
+    auto stdWriters = StdWriters::initDefaultSingleton();
+    
+    SlangResult res = innerMain(stdWriters, session, argc, argv);
     spDestroySession(session);
 
     return SLANG_FAILED(res) ? 1 : 0;
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 06c2aaf67..d0da4fc61 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1818,7 +1818,7 @@ void runTestsInDirectory(
 
 SlangResult innerMain(int argc, char** argv)
 {
-    StdWriters::initDefault();
+    auto stdWriters = StdWriters::initDefaultSingleton();
 
     // The context holds useful things used during testing
     TestContext context;
diff --git a/tools/slang-test/unit-test-path.cpp b/tools/slang-test/unit-test-path.cpp
index e9cfbe2e3..712453e23 100644
--- a/tools/slang-test/unit-test-path.cpp
+++ b/tools/slang-test/unit-test-path.cpp
@@ -35,7 +35,27 @@ static void pathUnitTest()
 
         SLANG_CHECK(Path::Simplify("a:\\what\\..\\.\\..\\is\\.\\..\\this\\.\\") == "a:/../this");
 
+        SLANG_CHECK(Path::Simplify("tests/preprocessor/.\\pragma-once-a.h") == "tests/preprocessor/pragma-once-a.h");
+
+
+        SLANG_CHECK(Path::IsRelative("."));
+        SLANG_CHECK(Path::IsRelative(".."));
+        SLANG_CHECK(Path::IsRelative("blah/.."));
+
+        SLANG_CHECK(Path::IsRelative("blah/.././a"));
+        SLANG_CHECK(Path::IsRelative("a") == false);
+        SLANG_CHECK(Path::IsRelative("blah/a") == false);
+        SLANG_CHECK(Path::IsRelative("a:\\blah/a") == false);
+
+
+        SLANG_CHECK(Path::IsRelative("a:/what/.././../is/./../this/."));
+
+        SLANG_CHECK(Path::IsRelative("a:/what/.././../is/./../this/./"));
+
+        SLANG_CHECK(Path::IsRelative("a:\\what\\..\\.\\..\\is\\.\\..\\this\\.\\"));
+
+
     }
 }
 
-SLANG_UNIT_TEST("Path", pathUnitTest);
-\ No newline at end of file
+SLANG_UNIT_TEST("Path", pathUnitTest);