Fix no-codegen test on musl64 tester #42827
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Apparently, busybox has strange behavior when you copy `$pfx/..` and the destination directory exists: ``` $ docker run -ti alpine # mkdir -p /tmp/foo/bar; touch /tmp/foo/bar/a /tmp/foo/bar/b # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/bar' '/tmp/foo/bar/..' -> '/tmp/foo2' # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/../bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/../bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/../bar' '/tmp/foo/bar/..' -> '/tmp/foo2/..' ``` We'll dodge this by using Julia's `cp()` function.
JeffBezanson
approved these changes
Oct 27, 2021
vtjnash
reviewed
Oct 27, 2021
test/compiler/codegen.jl
Outdated
| @@ -640,7 +640,7 @@ U41096 = Term41096{:U}(Modulate41096(:U, false)) | |||
|
|
|||
| # test that we can start julia with libjulia-codegen removed; PR #41936 | |||
| mktempdir() do pfx | |||
| run(`cp -r $(Sys.BINDIR)/.. $pfx`) | |||
| cp(dirname(Sys.BINDIR), pfx; force=true) | |||
| run(`rm -rf $pfx/lib/julia/libjulia-codegen\*`) | |||
There was a problem hiding this comment.
we are not allowed to assume rm exists either
There was a problem hiding this comment.
What's your favorite way to do glob-removal? filter(readdir())?
There was a problem hiding this comment.
That or just a loop sounds fine to me.
Note that we use `recursive=true` as we might encounter a `libjulia-codegen.X.Y.dylib.dSYM` directory. Although deleting that directory is not critical for this test, not throwing an exception is, so we just remove it as well. Also, this test would silently fail to test what we want it to if run out of a build directory, so we first teach it to dynamically find the location of `libjulia-codegen`, then secondly, cause it to fail if it does not remove any `libjulia-codegen` libraries.
LilithHafner
pushed a commit
to LilithHafner/julia
that referenced
this pull request
Feb 22, 2022
Apparently, busybox has strange behavior when you copy `$pfx/..` and the destination directory exists: ``` $ docker run -ti alpine # mkdir -p /tmp/foo/bar; touch /tmp/foo/bar/a /tmp/foo/bar/b # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/bar' '/tmp/foo/bar/..' -> '/tmp/foo2' # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/../bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/../bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/../bar' '/tmp/foo/bar/..' -> '/tmp/foo2/..' ``` We'll dodge this by using Julia's `cp()` function. * Eliminate usage of `rm` command-line program Note that we use `recursive=true` as we might encounter a `libjulia-codegen.X.Y.dylib.dSYM` directory. Although deleting that directory is not critical for this test, not throwing an exception is, so we just remove it as well. Also, this test would silently fail to test what we want it to if run out of a build directory, so we first teach it to dynamically find the location of `libjulia-codegen`, then secondly, cause it to fail if it does not remove any `libjulia-codegen` libraries.
LilithHafner
pushed a commit
to LilithHafner/julia
that referenced
this pull request
Mar 8, 2022
Apparently, busybox has strange behavior when you copy `$pfx/..` and the destination directory exists: ``` $ docker run -ti alpine # mkdir -p /tmp/foo/bar; touch /tmp/foo/bar/a /tmp/foo/bar/b # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/bar' '/tmp/foo/bar/..' -> '/tmp/foo2' # cp -vr /tmp/foo/bar/.. /tmp/foo2 '/tmp/foo/bar/../bar/a' -> '/tmp/foo2/../bar/a' '/tmp/foo/bar/../bar/b' -> '/tmp/foo2/../bar/b' '/tmp/foo/bar/../bar' -> '/tmp/foo2/../bar' '/tmp/foo/bar/..' -> '/tmp/foo2/..' ``` We'll dodge this by using Julia's `cp()` function. * Eliminate usage of `rm` command-line program Note that we use `recursive=true` as we might encounter a `libjulia-codegen.X.Y.dylib.dSYM` directory. Although deleting that directory is not critical for this test, not throwing an exception is, so we just remove it as well. Also, this test would silently fail to test what we want it to if run out of a build directory, so we first teach it to dynamically find the location of `libjulia-codegen`, then secondly, cause it to fail if it does not remove any `libjulia-codegen` libraries.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apparently, busybox has strange behavior when you copy
$pfx/..and the destination directory exists:We'll dodge this by using Julia's
cp()function.