Commit4891cbf

committed

allow more abs paths on windows, transform unix

1 parentb1f10a7 commit4891cbfCopy full SHA for 4891cbf

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,14 +243,15 @@ func isWindowsAbsPath(p string) bool {`
`243`	`243`	`returnfilepath.IsAbs(p)`
`244`	`244`	`}`
`245`	`245`
	`246`	`+// Remove the drive letter, if present.`
	`247`	`+iflen(p)>=2&&p[1]==':' {`
	`248`	`+p=p[2:]`
	`249`	`+}`
	`250`	`+`
`246`	`251`	`switch {`
`247`		`-caselen(p)<2:`
	`252`	`+caselen(p)==0:`
`248`	`253`	`returnfalse`
`249`		`-casep[1]==':':`
`250`		`-// Path starts with a drive letter.`
`251`		`-returnlen(p)==2\|\| (len(p)>=3&&p[2]=='\\')`
`252`		`-casep[0]=='\\'&&p[1]=='\\':`
`253`		`-// Path starts with \\.`
	`254`	`+casep[0]=='/'\|\|p[0]=='\\':`
`254`	`255`	`returntrue`
`255`	`256`	`default:`
`256`	`257`	`returnfalse`
`@@ -309,7 +310,7 @@ func resolveAgentAbsPath(workingDirectory, relOrAbsPath, agentOS string, local b`
`309`	`310`	`caseworkingDirectory!=""&&!isWindowsAbsPath(relOrAbsPath):`
`310`	`311`	`returnwindowsJoinPath(workingDirectory,relOrAbsPath),nil`
`311`	`312`	`caseisWindowsAbsPath(relOrAbsPath):`
`312`		`-returnrelOrAbsPath,nil`
	`313`	`+returnwindowsJoinPath(relOrAbsPath),nil`
`313`	`314`	`default:`
`314`	`315`	`return"",xerrors.Errorf("path %q not supported, use an absolute path instead",relOrAbsPath)`
`315`	`316`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ func Test_resolveAgentAbsPath(t *testing.T) {`
`33`	`33`	`{"ok with working directory and rel path on windows",args{workingDirectory:"C:\\some\\path",relOrAbsPath:"other\\path",agentOS:"windows"},"C:\\some\\path\\other\\path",false},`
`34`	`34`	`{"ok with working directory and abs path on windows",args{workingDirectory:"C:\\some\\path",relOrAbsPath:"C:\\other\\path",agentOS:"windows"},"C:\\other\\path",false},`
`35`	`35`	`{"ok with no working directory and abs path on windows",args{relOrAbsPath:"C:\\other\\path",agentOS:"windows"},"C:\\other\\path",false},`
	`36`	`+{"ok abs unix path on windows",args{workingDirectory:"C:\\some\\path",relOrAbsPath:"/other/path",agentOS:"windows"},"\\other\\path",false},`
	`37`	`+{"ok rel unix path on windows",args{workingDirectory:"C:\\some\\path",relOrAbsPath:"other/path",agentOS:"windows"},"C:\\some\\path\\other\\path",false},`
`36`	`38`
`37`	`39`	`{"fail with no working directory and rel path on windows",args{relOrAbsPath:"other\\path",agentOS:"windows"},"",true},`
`38`	`40`	`}`

Comments

(0)