-
Notifications
You must be signed in to change notification settings - Fork 146
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.
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
Fix compiletest build on nightly #203
Conversation
3e39c4a
to
10d1464
Compare
- echo -en 'travis_fold:end:script.bench\\r' | ||
|
||
- echo -en 'travis_fold:start:script.build\\r' | ||
- cargo build --release |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cargo bench
already does cargo build --release
so move this above bench
(or it makes not sense for nightly
config.src_base = PathBuf::from(format!("tests/{}", mode)); | ||
let dir = out_dir.to_str().unwrap(); | ||
config.target_rustcflags = Some(format!("-L {} -L {}/deps", dir, dir)); | ||
config.target_rustcflags = Some(format!("-L {}/build -L {}/deps", dir, dir)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what ends up in build?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The gluon libraries
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, hadn't seen that dir before but it looks like it just contains the output of the build script (or have it changed in a recent nightly?).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm - doesn't seem to work actually :/
4ac989a
to
bb8c513
Compare
env: | ||
global: | ||
- TRAVIS_CARGO_NIGHTLY_FEATURE="nightly" | ||
- secure: K26ZRkSrB2i9bUXgpIoMnKpgC1kItXDyvkIi1iRQE4aZxDOi7K43vO46heDcRrqVj+G5TLF3CTCS4eU7NW13tF2uh3a+r1Z8X1ZJuoVEnIAkMPQMm4GCnsRZUB23rBiNY1MB7CFCA8VhbLRCCgvr+OJZshb58XNZh2QSRGUY6MKbAAn11gCWvV7fl7CU0S65IveOxGQZLG8Rycb593hW8Vl1OEjYe8PD9yUz6kotIsiWqOcIWLF1bljoJFbTZMq07gp4n80wcx7OpeCFxHe9z0SOR81m3Jic2rHrvFNt72+lG7Exz6MavwHPENtotZ/81rvcg9F5dM0UJ6vaqnSbemXxQ8FGkuZImkIAbkyaKf8xwMx2++6mg76Sn8Y/dB4wc3PZlBE19834Zrtocp0t+vAmFmx/LDhJl5+sj3/vm+wbp317DVuQQCNeBqQoNarYxl/OpgNsbMhIYRDcK2SIPRp37E4PgYbW1/ilMNg46qis3O9tairjO6yJ7oep9OjNcDs8IQwUc9G47N63Xwpm6vhWPeCdC4LnRD+0eXce4C37W4q4CTSM5oYi7+hxV0vEGLWNV/YZdmaJpFoysJ774eIKevyOBRsSLqCMClU/rCVlJsFOzBLjYOaI6YARGDpHjcL2LbfNIBDSwe0yg5WkoIAA0EibPhDU9vedPSYFt5A= | ||
- secure: K26ZRkSrB2i9bUXgpIoMnKpgC1kItXDyvkIi1iRQE4aZxDOi7K43vO46heDcRrqVj+G5TLF3CTCS4eU7NW13tF2uh3a+r1Z8X1ZJuoVEnIAkMPQMm4GCnsRZUB23rBiNY1MB7CFCA8VhbLRCCgvr+OJZshb58XNZh2QSRGUY6MKbAAn11gCWvV7fl7CU0S65IveOxGQZLG8Rycb593hW8Vl1OEjYe8PD9yUz6kotIsiWqOcIWLF1bljoJFbTZMq07gp4n80wcx7OpeCFxHe9z0SOR81m3Jic2rHrvFNt72+lG7Exz6MavwHPENtotZ/81rvcg9F5dM0UJ6vaqnSbemXxQ8FGkuZImkIAbkyaKf8xwMx2++6mg76Sn8Y/dB4wc3PZlBE19834Zrtocp0t+vAmFmx/LDhJl5+sj3/vm+wbp317DVuQQCNeBqQoNarYxl/OpgNsbMhIYRDcK2SIPRp37E4PgYbW1/ilMNg46qis3O9tairjO6yJ7oep9OjNcDs8IQwUc9G47N63Xwpm6vhWPeCdC4LnRD+0eXce4C37W4q4CTSM5oYi7+hxV0vEGLWNV/YZdmaJpFoysJ774eIKevyOBRsSLqCMClU/rCVlJsFOzBLjYOaI6YARGDpHjcL2LbfNIBDSwe0yg5WkoIAA0EibPhDU9vedPSYFt5A= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we still need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this was just for doc uploads so no.
Can't seem to reproduce the compiletest failure locally, did you manage to do it or is it just travis? |
Just Travis I think |
Feeling a bit better today and managed to reproduce the build problem locally. Its not the most solid fix but it should work for all hours except 2 over the course of a year :). I believe that rust-lang/cargo#3319 might provide the necessary functionality to do this in a better way later on. |
Aaand it still fails, seems like a made a mistake when testing locally... |
Ok, that should do it. |
Apparently cargo/rustc no longer removes .rlibs compiled with a different set of feature flags (or rustc are no longer capable of disambiguate between them). Since gluon are compiled with a combination of `test`, `nightly` and `skeptic` we end up with two libgluon-xxxxxxx.rlib in deps and I select just one of them in this PR which should hopefully be the correct one.
d0b7364
to
0f051fd
Compare
Decided just to get rid of the build system stuff for now. Will merge on success. |
The build system seemed fine to me but okay. |
No description provided.