Skip to content

[against sf/repl_realpath] #33827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2019
Merged

[against sf/repl_realpath] #33827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d4277
fixup! Fix `realpath()` assumptions in REPL test suite
vtjnash Nov 12, 2019
4ee78b4
fixup! Fix `realpath()` assumptions in REPL test suite
vtjnash Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions base/client.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,9 @@ function repl_cmd(cmd, out)
if !haskey(ENV, "OLDPWD")
error("cd: OLDPWD not set")
end
cd(ENV["OLDPWD"])
else
@static if !Sys.iswindows()
# TODO: this is a rather expensive way to copy a string, remove?
# If it's intended to simulate `cd`, it should instead be doing
# more nearly `cd $dir && printf %s \$PWD` (with appropriate quoting),
# since shell `cd` does more than just `echo` the result.
dir = read(`$shell -c "printf '%s' $(shell_escape_posixly(dir))"`, String)
end
cd(dir)
dir = ENV["OLDPWD"]
end
cd(dir)
else
cd()
end
Expand Down
73 changes: 40 additions & 33 deletions stdlib/REPL/test/repl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,45 +107,52 @@ fake_repl() do stdin_write, stdout_read, repl
# Test cd feature in shell mode.
origpwd = pwd()
mktempdir() do tmpdir
# Test `cd`'ing to an absolute path
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd $(escape_string(tmpdir))\n")
readuntil(stdout_read, "cd $(escape_string(tmpdir))")
readuntil(stdout_read, escape_string(tmpdir))
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test realpath(pwd()) == realpath(tmpdir)

# Test using `cd` to move to the home directory
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd\n")
readuntil(stdout_read, homedir())
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test realpath(pwd()) == realpath(homedir())
try
samefile = Base.Filesystem.samefile
tmpdir_pwd = cd(pwd, tmpdir)
homedir_pwd = cd(pwd, homedir())

# Test using `-` to jump backward to tmpdir
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd -\n")
readuntil(stdout_read, escape_string(tmpdir))
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test realpath(pwd()) == realpath(tmpdir)

# Test using `~` in `cd` commands
if !Sys.iswindows()
# Test `cd`'ing to an absolute path
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd ~\n")
readuntil(stdout_read, homedir())
write(stdin_write, "cd $(escape_string(tmpdir))\n")
readuntil(stdout_read, "cd $(escape_string(tmpdir))")
readuntil(stdout_read, tmpdir_pwd)
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test samefile(".", tmpdir)

# Test using `cd` to move to the home directory
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd\n")
readuntil(stdout_read, homedir_pwd)
readuntil(stdout_read, "\n")
@test realpath(pwd()) == realpath(homedir())
readuntil(stdout_read, "\n")
@test samefile(".", homedir_pwd)

# Test using `-` to jump backward to tmpdir
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd -\n")
readuntil(stdout_read, tmpdir_pwd)
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test samefile(".", tmpdir)

# Test using `~` (Base.expanduser) in `cd` commands
if !Sys.iswindows()
write(stdin_write, ";")
readuntil(stdout_read, "shell> ")
write(stdin_write, "cd ~\n")
readuntil(stdout_read, homedir_pwd)
readuntil(stdout_read, "\n")
readuntil(stdout_read, "\n")
@test samefile(".", homedir_pwd)
end
finally
cd(origpwd)
end
cd(origpwd)
end

# issue #20482
Expand Down