Skip to content

Commit 8ceeb68

Browse files
KristofferCKristofferC
authored
Merge pull request #39495 from JuliaLang/backports-release-1.6
Two more backports for 1.6-RC1
2 parents e02764c + 81329da commit 8ceeb68

File tree

6 files changed

+63
-42
lines changed

6 files changed

+63
-42
lines changed

‎deps/checksums/LibGit2.v1.2.1+0.x86_64-apple-darwin.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/LibGit2.v1.2.1+0.x86_64-apple-darwin.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/LibGit2.v1.2.2+0.x86_64-apple-darwin.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/LibGit2.v1.2.2+0.x86_64-apple-darwin.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/libgit2

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
LibGit2.v1.1.0+0.aarch64-apple-darwin.tar.gz/md5/34da9c7d3c461027214449bc94770fdf
2-
LibGit2.v1.1.0+0.aarch64-apple-darwin.tar.gz/sha512/db3b247e5c64bbee4c6eecdb97550ef7c1e0b76e0c6d8165dfa21051a1cb812fac99ba6f5809f17d9242e3c21b612dde00fc8977566cc3740edfa79d7f8fb0f2
3-
LibGit2.v1.1.0+0.aarch64-linux-gnu.tar.gz/md5/9244f8444577d5b157043ab1f2422bd7
4-
LibGit2.v1.1.0+0.aarch64-linux-gnu.tar.gz/sha512/ac175c4ce4f35a42878b9557f9ad8d43e93d0b053d2bd675d15929d411a792d03facdf37feaf8669cca827576c36b5d979f0dcd97845600cbf68041745074ce2
5-
LibGit2.v1.1.0+0.aarch64-linux-musl.tar.gz/md5/2edd32abf0c3b499c102cf4a74b807cd
6-
LibGit2.v1.1.0+0.aarch64-linux-musl.tar.gz/sha512/bf636a573ed4d4f216790fdc323119541edefd6f7c760a754766cf6e00ccbf0e54106da1aafa09eee077ff5504a0f3141776d59012f8b4104f2ae0f9419ff861
7-
LibGit2.v1.1.0+0.armv6l-linux-gnueabihf.tar.gz/md5/6132d8077d44e7b5f7bd1ccc08dd4458
8-
LibGit2.v1.1.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/9361fa04d31675be22717d311d7f192955e373dbe7da153e15d2db1c0bf228e6c6e0ad658804e4880da489434bb67d1df5024d1b6120f3d1a15fd8422ebb006a
9-
LibGit2.v1.1.0+0.armv6l-linux-musleabihf.tar.gz/md5/cc4ebfe5a209c7a9dbf378bf475af896
10-
LibGit2.v1.1.0+0.armv6l-linux-musleabihf.tar.gz/sha512/12f669a8c566743e77ee3c3dacc8faa7d9a9c5cb945811a13cf6a06266a2004b7e0d4b9dad0c9c0685320e3f18a1b7324fabf42ca789b28ee18aeedf7c03a2af
11-
LibGit2.v1.1.0+0.armv7l-linux-gnueabihf.tar.gz/md5/49abd60943155b5c634fb11aa584f8eb
12-
LibGit2.v1.1.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/a04a375049fa8ca8ce4abb9a276e2d8d518a0a0060e8abb8fc15cd84d1ce918bfadb54e1a80a71ea71ac78621f09c1bc871b848505cb3404e3a3addb26d41991
13-
LibGit2.v1.1.0+0.armv7l-linux-musleabihf.tar.gz/md5/1b4ec616bb27f4a9ce89836a011b36d4
14-
LibGit2.v1.1.0+0.armv7l-linux-musleabihf.tar.gz/sha512/84192ff6613b75c7858fd25383ceaf833ad89fca9f3a3114d6b6d00627f171d0b63a1607c797afee23bae4ea582ebf28492a242f656d2cd3f380e68bbeee23c6
15-
LibGit2.v1.1.0+0.i686-linux-gnu.tar.gz/md5/2cd09f8811de5d214fcee482d5804049
16-
LibGit2.v1.1.0+0.i686-linux-gnu.tar.gz/sha512/4ce79e8c64da3d5298457ae8ccfc551e23738a5eda1b4af80257cae8fb0913ac7e76b19b631804885dff40ecef96525ab4dc61b847dadac297daae210496f7b2
17-
LibGit2.v1.1.0+0.i686-linux-musl.tar.gz/md5/7a397178b27f7163826ea31a460d2dcb
18-
LibGit2.v1.1.0+0.i686-linux-musl.tar.gz/sha512/cb4465ea3d8e4b6dc1168be752d49c4b8472d28128ea7c0a6c8ae4d40349b10599faa9833e2bb64f3d1169339955757469d92bfdfc533f29647d27d36404c14c
19-
LibGit2.v1.1.0+0.i686-w64-mingw32.tar.gz/md5/06a32e7c8e052daedb8c1e752df71641
20-
LibGit2.v1.1.0+0.i686-w64-mingw32.tar.gz/sha512/9627fa958a3e9d59347ef4790f53bc5207c4f69452a33fc6a804c9593a15814c753e99b749d0a08af5699bd761f2a8784b9da3bb3390086def0651684123e76d
21-
LibGit2.v1.1.0+0.powerpc64le-linux-gnu.tar.gz/md5/0fa6db81b8fd9a1b564f0a042f737996
22-
LibGit2.v1.1.0+0.powerpc64le-linux-gnu.tar.gz/sha512/5bfdda53e20865f87557a800c629691bf4b59d08814dd535e17402de27b8a187bcfa63d87ce3a6d77cf4042322eeab27f4abef67e8356607a6999ac1642b9d15
23-
LibGit2.v1.1.0+0.x86_64-apple-darwin.tar.gz/md5/35998eab99b896aca79eeb229e9ccb3d
24-
LibGit2.v1.1.0+0.x86_64-apple-darwin.tar.gz/sha512/05563bf993efe54e1bfd808aa8e01ad89cfe86bb4ce9249f9a9959af4f3762c5afab3d716441719e9f15d97846f37ed6d76f540a7f7fe49b95b66997266e7256
25-
LibGit2.v1.1.0+0.x86_64-linux-gnu.tar.gz/md5/657f467e31d5b20c02a173e1aa795a17
26-
LibGit2.v1.1.0+0.x86_64-linux-gnu.tar.gz/sha512/a959d06cb3d77888e6a070b583d89d19ffa4e881d7dac9a6f452796880f88cb50152fa072f0ae7fa5bee680918fba4df5ee08d88ac6061269deb8113875a9f42
27-
LibGit2.v1.1.0+0.x86_64-linux-musl.tar.gz/md5/9acaec9b4bb64373ced00ca456858017
28-
LibGit2.v1.1.0+0.x86_64-linux-musl.tar.gz/sha512/87334784bfb3268a5e13f0793e66818927023647b2ee1c95a1194b03b3fc51f80131bd6b15adc784096b3230286969ea4c0616241b65f29fd3cb6c6f132bf39f
29-
LibGit2.v1.1.0+0.x86_64-unknown-freebsd.tar.gz/md5/67686961443c01ed5a08be62a8b83cde
30-
LibGit2.v1.1.0+0.x86_64-unknown-freebsd.tar.gz/sha512/a62d083e3983d4481a7e3e28bf77d45df8d3728fc2ff8ee3febacbbe5507734649a53fbb3614bf67265cd5d372468168d123d5bda46b2e23a132efdd7cfec1cc
31-
LibGit2.v1.1.0+0.x86_64-w64-mingw32.tar.gz/md5/60073f2e1f61795841fbb3661d8e27f8
32-
LibGit2.v1.1.0+0.x86_64-w64-mingw32.tar.gz/sha512/7a90b1aa62c4542f100591ac4407711433fbd9ba61b838ff11a820760a1c659c562860ce3fd6f15492f96dcdc2b8f130589c7b70339b78246b366fd9e7cc3a3c
331
libgit2-7f4fa178629d559c037a1f72f79f79af9c1ef8ce.tar.gz/md5/c6a819fb0bf924df61e1595624a0988a
342
libgit2-7f4fa178629d559c037a1f72f79f79af9c1ef8ce.tar.gz/sha512/3de9c042115b309dae3b8e0008edf2e762addd90a7bdb54b3cf634811271ab9dbfea35656650eb53a3faec73caf33ed199fb885ec21f611c79d909d9f4fe48c5
3+
LibGit2.v1.2.2+0.aarch64-apple-darwin.tar.gz/md5/768643046e35a7594f731323bebad389
4+
LibGit2.v1.2.2+0.aarch64-apple-darwin.tar.gz/sha512/7ff1e0eeb2651064cf530468206335bffbc87b13fc310de7f1d0b802b4a53d5aed9267053edeb59b6b2f2ce90548c3a3e90f8f657cb8206eaa19dbe6be065723
5+
LibGit2.v1.2.2+0.aarch64-linux-gnu.tar.gz/md5/be6570490bbdac65b35c6ab8d8a109df
6+
LibGit2.v1.2.2+0.aarch64-linux-gnu.tar.gz/sha512/d70c5bf5032f5b48992690951aa3a105341476ca7b2c25b706d03425c0b6323fbb8060c8dffec191721f2ecaa7eeb6cf9cd38d30cd29095443c14d6cc44744f2
7+
LibGit2.v1.2.2+0.aarch64-linux-musl.tar.gz/md5/d4f7c9d31e1008a08e07eee3ac6a6b46
8+
LibGit2.v1.2.2+0.aarch64-linux-musl.tar.gz/sha512/bd6b9c0ef8d9b4747594516df0e89f62ae42d0c96dc821428bf554f4bfcd843fb7f54999ea8a445dcbf3ca94096bf2f977311266310fa9928955c57bc78c64a6
9+
LibGit2.v1.2.2+0.armv6l-linux-gnueabihf.tar.gz/md5/1d50d2d1b3a67a0ad5212473c4421903
10+
LibGit2.v1.2.2+0.armv6l-linux-gnueabihf.tar.gz/sha512/10fca34a941a62631175b43cb662fde498104ebfa70a12271f319cb5c295dfafd02ce9a0a1cd3c677ccd253811102f32bba46b9e7935aafc63d49db18bc1d930
11+
LibGit2.v1.2.2+0.armv6l-linux-musleabihf.tar.gz/md5/43bf610eb0ebd793f914c47924b022e0
12+
LibGit2.v1.2.2+0.armv6l-linux-musleabihf.tar.gz/sha512/5594c836a2e8ea8be7c85ca6063401f8141edf87bd156460792f1d0f21002cf685cea1872edbf7c18412c3201754f350d6c3520c453763041abaf36e53d9a04b
13+
LibGit2.v1.2.2+0.armv7l-linux-gnueabihf.tar.gz/md5/e0bb95d822e616dce731e0eae26f015b
14+
LibGit2.v1.2.2+0.armv7l-linux-gnueabihf.tar.gz/sha512/855b7116a52e8a53789697d69c45470d102ed70a9bf6b8ec87370c0bdd530b9e1178ff18fe270f46113e099a88694a42423319db3eb41e53b0bc594c76536fd5
15+
LibGit2.v1.2.2+0.armv7l-linux-musleabihf.tar.gz/md5/b4acf755de779ed6dbda48cfef8589b4
16+
LibGit2.v1.2.2+0.armv7l-linux-musleabihf.tar.gz/sha512/fc9dd9a4d3e868085b54061b7eedf4f2331f5338e02b1de2c63ac9f7ddbb1b872b350365a82beb65a791a3872755111c832047622362d8b56d1d2b662b98bf09
17+
LibGit2.v1.2.2+0.i686-linux-gnu.tar.gz/md5/efa3612e46fbe2826028b70ebdd6ab90
18+
LibGit2.v1.2.2+0.i686-linux-gnu.tar.gz/sha512/c4d54e381a1ef6d972c5d82ad24bf3b9fd403f988e4ff6779579f994732450a2c93880be096861b9d43c836901eec173ca392bd759f52a7db358ceebd799487f
19+
LibGit2.v1.2.2+0.i686-linux-musl.tar.gz/md5/72a361323ac5351241b9022a1bf2d6af
20+
LibGit2.v1.2.2+0.i686-linux-musl.tar.gz/sha512/c6d5d169413f0effa217d35edb74f5cd6db1ca31b98459b2773ce927c66a9a434f206c89a6878218ac14a3e3ff717e8f22935dba17ae4a25d011542045363401
21+
LibGit2.v1.2.2+0.i686-w64-mingw32.tar.gz/md5/6677a563b679f969c2b0f12eefd10c12
22+
LibGit2.v1.2.2+0.i686-w64-mingw32.tar.gz/sha512/369944643a179aa6fea6a5ebb82ef07bdb9f220890f670bbf5ccd8285edb68f25d96a33b448c789aea4f649876caa89c00bb52d1e7a65a4ffc5a8c6692aa2523
23+
LibGit2.v1.2.2+0.powerpc64le-linux-gnu.tar.gz/md5/cb9195eb5ab95d0ec53559ec2b42d4cc
24+
LibGit2.v1.2.2+0.powerpc64le-linux-gnu.tar.gz/sha512/fc4387327f953174815988c8514c673529e3e2fa1b7209bfd80755890438bf10c644f85c988435bb45cd96d939fa5409f85d47e9a8ae0480b184ff718af53fa4
25+
LibGit2.v1.2.2+0.x86_64-apple-darwin.tar.gz/md5/693080c66702c9ff106b0935f01d1f96
26+
LibGit2.v1.2.2+0.x86_64-apple-darwin.tar.gz/sha512/f21d5846b443188a0c604255dce77603ea861db8d4c6fc55cebd5db6da07e94ae40f0a165221c95e13db9df8777fddb05f55c865f554f45e56cd442332a95336
27+
LibGit2.v1.2.2+0.x86_64-linux-gnu.tar.gz/md5/493a08e9461756a7aff6c6982d54f598
28+
LibGit2.v1.2.2+0.x86_64-linux-gnu.tar.gz/sha512/d2b4e7965d47cd73572884dc65c3596b0148390bcf22900f199d60663d44fc90ab1bd5dc733711d6acea9f063a6a2e974341e3a602ef11ee928b9f29c934e893
29+
LibGit2.v1.2.2+0.x86_64-linux-musl.tar.gz/md5/153cc65bd29f4ff78b8f0502ae29f3b6
30+
LibGit2.v1.2.2+0.x86_64-linux-musl.tar.gz/sha512/7238e6b8a7defdaaff7ca3b81404e6003179ede162fa33e92937f5af1e78ea7f652527dc5968e23d29305812690d88f57c6aeb9270b1f1d9e700a0e0674cc77c
31+
LibGit2.v1.2.2+0.x86_64-unknown-freebsd.tar.gz/md5/6ff9aa266d900c6e4d894a8ef2c4425e
32+
LibGit2.v1.2.2+0.x86_64-unknown-freebsd.tar.gz/sha512/e248ff490706f638c23873d90eef6b74e178a964ba80a73b2f330b4633157ecf91609aa19a3163d78b39aec49b9b93fc209877b98e1a631b7a166ad91395ff21
33+
LibGit2.v1.2.2+0.x86_64-w64-mingw32.tar.gz/md5/4289124917d0ddfbd4bdeb87e3e4b0d9
34+
LibGit2.v1.2.2+0.x86_64-w64-mingw32.tar.gz/sha512/49ba2217a537d45754cc0929589844b852c6e9ea300775952164510f012446671b799ce1614dcb8a8b82aa387495e5ecca641c2f3a985b788c2350712588aacc

‎stdlib/REPL/test/repl.jl

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,23 @@ fake_repl(options = REPL.Options(confirm_exit=false,hascolor=true)) do stdin_wri
104104
let cmd = "\"Hello REPL\""
105105
write(stdin_write, "$(curmod_prefix)inc || wait($(curmod_prefix)b); r = $cmd; notify($(curmod_prefix)c); r\r")
106106
end
107-
inc = true
108-
notify(b)
109-
wait(c)
107+
let t = @async begin
108+
inc = true
109+
notify(b)
110+
wait(c)
111+
end
112+
while (d = readline(stdout_read)) != ""
113+
# first line [optional]: until 80th char of input
114+
# second line: until end of input
115+
# third line: "Hello REPL"
116+
# last line: blank
117+
# last+1 line: next prompt
118+
end
119+
wait(t)
120+
end
110121

111122
# Latex completions
123+
readuntil(stdout_read, "julia> ", keep=true)
112124
write(stdin_write, "\x32\\alpha\t")
113125
readuntil(stdout_read, "α")
114126
# Bracketed paste in search mode
@@ -1027,13 +1039,16 @@ fake_repl() do stdin_write, stdout_read, repl
10271039
write(stdin_write, "TestShowTypeREPL.TypeA\n")
10281040
@test endswith(readline(stdout_read), "\r\e[7CTestShowTypeREPL.TypeA\r\e[29C")
10291041
readline(stdout_read)
1030-
readline(stdout_read)
1042+
@test readline(stdout_read) == ""
10311043
@eval Main using .TestShowTypeREPL
1044+
readuntil(stdout_read, "julia> ", keep=true)
10321045
write(stdin_write, "TypeA\n")
10331046
@test endswith(readline(stdout_read), "\r\e[7CTypeA\r\e[12C")
10341047
readline(stdout_read)
1048+
@test readline(stdout_read) == ""
10351049

10361050
# Close REPL ^D
1051+
readuntil(stdout_read, "julia> ", keep=true)
10371052
write(stdin_write, '\x04')
10381053
Base.wait(repltask)
10391054
end
@@ -1152,10 +1167,13 @@ fake_repl() do stdin_write, stdout_read, repl
11521167
write(stdin_write, "Expr(:call, GlobalRef(Base.Math, :float), Core.SlotNumber(1))\n")
11531168
readline(stdout_read)
11541169
@test readline(stdout_read) == "\e[0m:(Base.Math.float(_1))"
1170+
@test readline(stdout_read) == ""
1171+
readuntil(stdout_read, "julia> ", keep=true)
11551172
write(stdin_write, "ans\n")
11561173
readline(stdout_read)
1157-
readline(stdout_read)
11581174
@test readline(stdout_read) == "\e[0m:(Base.Math.float(_1))"
1175+
@test readline(stdout_read) == ""
1176+
readuntil(stdout_read, "julia> ", keep=true)
11591177
write(stdin_write, '\x04')
11601178
Base.wait(repltask)
11611179
end
@@ -1168,10 +1186,15 @@ fake_repl() do stdin_write, stdout_read, repl
11681186
write(stdin_write, "struct Errs end\n")
11691187
readline(stdout_read)
11701188
readline(stdout_read)
1189+
readuntil(stdout_read, "julia> ", keep=true)
11711190
write(stdin_write, "Base.show(io::IO, ::Errs) = throw(Errs())\n")
11721191
readline(stdout_read)
11731192
readline(stdout_read)
1193+
readuntil(stdout_read, "julia> ", keep=true)
11741194
write(stdin_write, "Errs()\n")
1195+
readline(stdout_read)
1196+
readline(stdout_read)
1197+
readuntil(stdout_read, "julia> ", keep=true)
11751198
write(stdin_write, '\x04')
11761199
wait(repltask)
11771200
@test istaskdone(repltask)
@@ -1184,7 +1207,8 @@ fake_repl() do stdin_write, stdout_read, repl
11841207
end
11851208
write(stdin_write, "?;\n")
11861209
readline(stdout_read)
1187-
@test endswith(readline(stdout_read),";")
1210+
@test endswith(readline(stdout_read), "search: ;")
1211+
readuntil(stdout_read, "julia> ", keep=true)
11881212
write(stdin_write, '\x04')
11891213
Base.wait(repltask)
11901214
end
@@ -1197,6 +1221,7 @@ fake_repl() do stdin_write, stdout_read, repl
11971221
write(stdin_write, "global x\n")
11981222
readline(stdout_read)
11991223
@test !occursin("ERROR", readline(stdout_read))
1224+
readuntil(stdout_read, "julia> ", keep=true)
12001225
write(stdin_write, '\x04')
12011226
Base.wait(repltask)
12021227
end

0 commit comments

Comments
 (0)