AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #2 from Bekenn/fix-path-join-tests

Browse Source 
Added tests for path.join
This commit is contained in:
Tom van Dijck 2015-09-08 12:17:32 -07:00
commit 40c8127679
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/host/path_join.c
View File

@ -75,10 +75,6 @@ int path_join(lua_State* L)
break;
}
if (start[0] == '.' && start[1] == '.' && start[2] == '\0'){
break;
}
/* otherwise trim segment and the ".." sequence */
if (start != buffer) {
--start;

23
tests/base/test_path.lua
View File

@ -209,13 +209,13 @@
test.isequal("..", path.getrelative("/a///b/c","/a/b"))
end
function suite.getrelative_ignoresTrailingSlashes()
test.isequal("c", path.getrelative("/a/b/","/a/b/c"))
end
function suite.getrelative_ignoresTrailingSlashes()
test.isequal("c", path.getrelative("/a/b/","/a/b/c"))
end
function suite.getrelative_returnsAbsPath_onContactWithFileSysRoot()
test.isequal("C:/Boost/Include", path.getrelative("C:/Code/MyApp", "C:/Boost/Include"))
end
function suite.getrelative_returnsAbsPath_onContactWithFileSysRoot()
test.isequal("C:/Boost/Include", path.getrelative("C:/Code/MyApp", "C:/Boost/Include"))
end
--
@ -323,6 +323,17 @@
test.isequal("$(ProjectDir)/$(TargetName)/../../Bin", path.join("$(ProjectDir)/$(TargetName)", "../../Bin"))
end
function suite.join_keepsComplexInternalEnvVar()
test.isequal("$(ProjectDir)/myobj_$(Arch)/../../Bin", path.join("$(ProjectDir)/myobj_$(Arch)", "../../Bin"))
end
function suite.join_keepsRecursivePattern()
test.isequal("p1/**.lproj/../p2", path.join("p1/**.lproj", "../p2"))
end
function suite.join_noCombineSingleDot()
test.isequal("p1/./../p2", path.join("p1/.", "../p2"))
end
--