diff --git a/lib/pure/ospaths.nim b/lib/pure/ospaths.nim index 58642ce1327b1..308a928366b8a 100644 --- a/lib/pure/ospaths.nim +++ b/lib/pure/ospaths.nim @@ -721,18 +721,6 @@ when defined(windows) or defined(posix) or defined(nintendoswitch): result.add quoteShell(args[i]) when isMainModule: - assert quoteShellWindows("aaa") == "aaa" - assert quoteShellWindows("aaa\"") == "aaa\\\"" - assert quoteShellWindows("") == "\"\"" - - assert quoteShellPosix("aaa") == "aaa" - assert quoteShellPosix("aaa a") == "'aaa a'" - assert quoteShellPosix("") == "''" - assert quoteShellPosix("a'a") == "'a'\"'\"'a'" - - when defined(posix): - assert quoteShell("") == "''" - block normalizePathEndTest: # handle edge cases correctly: shouldn't affect whether path is # absolute/relative @@ -765,4 +753,3 @@ when isMainModule: doAssert r"C:\foo".rootPrefixLength == 3 doAssert r"//foo".rootPrefixLength == 2 doAssert r"C:\\foo".rootPrefixLength == 4 - diff --git a/tests/stdlib/tospaths.nim b/tests/stdlib/tospaths.nim index f75728e5e133a..96a96c770523a 100644 --- a/tests/stdlib/tospaths.nim +++ b/tests/stdlib/tospaths.nim @@ -41,19 +41,22 @@ block unixToNativePath: doAssert unixToNativePath("/abc", "a") == "/abc" doAssert unixToNativePath("/abc/def", "a") == "/abc/def" -block normalizePathEnd: - doAssert "".normalizePathEnd == "" - doAssert "".normalizePathEnd(trailingSep = true) == "" - when defined(posix): - doAssert "/".normalizePathEnd == "/" - doAssert "foo.bar".normalizePathEnd == "foo.bar" - doAssert "foo.bar".normalizePathEnd(trailingSep = true) == "foo.bar/" - when defined(Windows): - doAssert r"C:\\".normalizePathEnd == r"C:\" - doAssert r"C:\".normalizePathEnd(trailingSep = true) == r"C:\" - doAssert r"C:\foo\\bar\".normalizePathEnd == r"C:\foo\\bar" block joinPath: when defined(posix): doAssert joinPath("", "/lib") == "/lib" +block quoteShellWindowsTest: + assert quoteShellWindows("aaa") == "aaa" + assert quoteShellWindows("aaa\"") == "aaa\\\"" + assert quoteShellWindows("") == "\"\"" + +block quoteShellPosixTest: + assert quoteShellPosix("aaa") == "aaa" + assert quoteShellPosix("aaa a") == "'aaa a'" + assert quoteShellPosix("") == "''" + assert quoteShellPosix("a'a") == "'a'\"'\"'a'" + +block quoteShellTest: + when defined(posix): + assert quoteShell("") == "''"