Search for Xargo.toml in parent directories, including test #254

Nils-TUD · 2019-09-09T12:03:57Z

So far, xargo expected the Xargo.toml in the directory of the Cargo.toml. This patch searches for the Xargo.toml by walking up the directory hierarchy. This is useful if a workspace is used, leading, for example, to one Cargo.toml with the workspace and multiple Cargo.toml files for the members of the workspace. With this patch, it is no longer necessary to have one Xargo.toml for each Cargo.toml, but only one next to the workspace, for example.

Nils-TUD · 2019-09-09T12:29:31Z

The test "test" seems to be a bit unstable. It failed for me a couple of times as well, but now it works.

RalfJung · 2019-09-09T20:03:13Z

That's a network failure indeed. I restarted that build.

RalfJung · 2019-09-09T20:15:53Z

And now this fails due to rust-lang/rust#64320. We'll have to wait until that lands.

RalfJung · 2019-09-11T15:22:08Z

All right, this should work now then.

bors r+

254: Search for Xargo.toml in parent directories, including test r=RalfJung a=Nils-TUD So far, xargo expected the Xargo.toml in the directory of the Cargo.toml. This patch searches for the Xargo.toml by walking up the directory hierarchy. This is useful if a workspace is used, leading, for example, to one Cargo.toml with the workspace and multiple Cargo.toml files for the members of the workspace. With this patch, it is no longer necessary to have one Xargo.toml for each Cargo.toml, but only one next to the workspace, for example. Co-authored-by: Nils Asmussen <nils@os.inf.tu-dresden.de>

bors · 2019-09-11T15:37:19Z

Build failed

continuous-integration/travis-ci/push

RalfJung · 2019-09-11T16:40:03Z

Looks like your test does not work with the 2018-12-01 nightly?

running: "cc" "-O0" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "-mthumb" "-march=armv7-m" "-fno-builtin" "-fvisibility=hidden" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-o" "/tmp/xargo.gIvG1WHQOidU/target/thumbv7m-parent-eabi/debug/build/compiler_builtins-588acbe8be9479e8/out/../../libcompiler_builtins/compiler-rt/lib/builtins/absvdi2.o" "-c" "../../libcompiler_builtins/compiler-rt/lib/builtins/absvdi2.c"

cargo:warning=cc: error: unrecognized command line option ‘-mthumb’

Is this a fairly recent target you are testing here? Could you use one used by other tests (and thus likely supported for longer already)?

Nils-TUD · 2019-09-11T19:02:23Z

That's weird, because I did already copy the target from another test (and changed the middle part, as the other tests do, because apparently it's a problem if two have the same name). The target_dependencies test uses thumbv7m-none-eabi, which works according to the log. I'm not sure what's going on there...

Edit: And it's calling gcc, so that's too old apparently. But why isn't that called for the other test?

RalfJung · 2019-09-14T11:21:47Z

I am not sure either. I don't know anything about all this ARM/cross-compilation stuff.^^

Maybe it has something to do with the "none" target also occurring here, whereas your target does not?

Nils-TUD · 2019-09-15T05:48:37Z

Ok, it is interesting that the two other tests that have the comment "need this exact target name to get the right gcc flags" use an existing target (with "none"). So, maybe this is the problem.

As far as I can see, it should be an existing target, but cannot be a target that the host has already built. Otherwise it will find the alloc library in any case.

Let's try riscv32i-unknown-none-elf :)

RalfJung · 2019-09-15T11:22:54Z

That does not seem to work...

As far as I can see, it should be an existing target, but cannot be a target that the host has already built. Otherwise it will find the alloc library in any case.

Parallelism is another problem here -- tests are run in parallel. That's why the "host" tests have locking logic.

RalfJung · 2019-09-15T11:23:29Z

What about modifying an existing test to have the toml file in a parent directory?

Nils-TUD · 2019-09-16T08:50:36Z

That does not seem to work...

But interestingly, my test (target_dependencies_parentdir) works. Only host_patch
and test fail. And they fail, because backtrace is not found. I don't see why that is related.

What about modifying an existing test to have the toml file in a parent directory?

That's exactly what I did, based on the target_dependencies test. But I can't use the same target, because this apparently causes those two tests to interfere with each other.

I'm a bit lost here. It works for me locally and with travis, only other and unrelated tests fail. Any suggestions?

RalfJung · 2019-09-18T08:03:36Z

But interestingly, my test (target_dependencies_parentdir) works. Only host_patch
and test fail. And they fail, because backtrace is not found. I don't see why that is related.

Ah, I should have checked the log then. ;)
This was an instance of rust-lang/rust#64410.

That's exactly what I did, based on the target_dependencies test. But I can't use the same target, because this apparently causes those two tests to interfere with each other.

No, what I meant is not to copy and modify, but to modify in-place.
But if what you got now works, that's even better.

tests/smoke.rs

RalfJung · 2019-09-18T19:20:04Z

Thanks a lot!

bors r+

254: Search for Xargo.toml in parent directories, including test r=RalfJung a=Nils-TUD So far, xargo expected the Xargo.toml in the directory of the Cargo.toml. This patch searches for the Xargo.toml by walking up the directory hierarchy. This is useful if a workspace is used, leading, for example, to one Cargo.toml with the workspace and multiple Cargo.toml files for the members of the workspace. With this patch, it is no longer necessary to have one Xargo.toml for each Cargo.toml, but only one next to the workspace, for example. Co-authored-by: Nils Asmussen <nils@os.inf.tu-dresden.de>

bors · 2019-09-18T19:35:36Z

Build failed

continuous-integration/travis-ci/push

Nils-TUD · 2019-09-18T20:29:28Z

Why does it try to build the arm/aeabi_cdcmp.S when building for riscv?

hm, maybe I should really just modify the target_depencencies test in-place?

RalfJung · 2019-09-18T20:45:37Z

I'm afraid I don't know.

We could change the minimal supported version to nighty-2019-01-01 (mostly because that's a much less arbitrary date :D ), but I am not sure if making it one month younger will help with whatever issue you are running into here.

Nils-TUD · 2019-09-19T04:59:59Z

I'm also fine with that, but I would suggest that I simply modify an existing test. I don't think that we lose anything with that.

This commit does not add a new test, because a unique and existing target is required, which turned out to be challenging.

RalfJung · 2019-09-19T08:26:12Z

Yeah, this is fine. Thanks!

bors r+

254: Search for Xargo.toml in parent directories, including test r=RalfJung a=Nils-TUD So far, xargo expected the Xargo.toml in the directory of the Cargo.toml. This patch searches for the Xargo.toml by walking up the directory hierarchy. This is useful if a workspace is used, leading, for example, to one Cargo.toml with the workspace and multiple Cargo.toml files for the members of the workspace. With this patch, it is no longer necessary to have one Xargo.toml for each Cargo.toml, but only one next to the workspace, for example. Co-authored-by: Nils Asmussen <nils@os.inf.tu-dresden.de>

bors · 2019-09-19T08:40:33Z

Build succeeded

continuous-integration/travis-ci/push

RalfJung · 2019-09-19T08:47:43Z

Yay, finally. :)

Nils-TUD · 2019-09-19T10:24:18Z

Great :)

Search for Xargo.toml in parent directories.

fd8fe35

Nils-TUD force-pushed the toml branch from 26494e7 to b3e9827 Compare September 15, 2019 05:49

RalfJung reviewed Sep 18, 2019

View reviewed changes

tests/smoke.rs Show resolved Hide resolved

Nils-TUD force-pushed the toml branch from b3e9827 to d0dfcdc Compare September 18, 2019 17:44

Modified existing test to search Xargo.toml in parent directory.

a5f8503

This commit does not add a new test, because a unique and existing target is required, which turned out to be challenging.

Nils-TUD force-pushed the toml branch from d0dfcdc to a5f8503 Compare September 19, 2019 05:06

bors bot merged commit a5f8503 into japaric:master Sep 19, 2019

marysaka mentioned this pull request Oct 11, 2019

Canonicalize issue with Xargo.toml in parent directory #259

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Search for Xargo.toml in parent directories, including test #254

Search for Xargo.toml in parent directories, including test #254

Nils-TUD commented Sep 9, 2019

Nils-TUD commented Sep 9, 2019

RalfJung commented Sep 9, 2019

RalfJung commented Sep 9, 2019

RalfJung commented Sep 11, 2019

bors bot commented Sep 11, 2019

RalfJung commented Sep 11, 2019

Nils-TUD commented Sep 11, 2019 •

edited

Loading

RalfJung commented Sep 14, 2019

Nils-TUD commented Sep 15, 2019

RalfJung commented Sep 15, 2019

RalfJung commented Sep 15, 2019

Nils-TUD commented Sep 16, 2019

RalfJung commented Sep 18, 2019 •

edited

Loading

RalfJung commented Sep 18, 2019

bors bot commented Sep 18, 2019

Nils-TUD commented Sep 18, 2019

RalfJung commented Sep 18, 2019

Nils-TUD commented Sep 19, 2019

RalfJung commented Sep 19, 2019

bors bot commented Sep 19, 2019

RalfJung commented Sep 19, 2019

Nils-TUD commented Sep 19, 2019

Search for Xargo.toml in parent directories, including test #254

Search for Xargo.toml in parent directories, including test #254

Conversation

Nils-TUD commented Sep 9, 2019

Nils-TUD commented Sep 9, 2019

RalfJung commented Sep 9, 2019

RalfJung commented Sep 9, 2019

RalfJung commented Sep 11, 2019

bors bot commented Sep 11, 2019

Build failed

RalfJung commented Sep 11, 2019

Nils-TUD commented Sep 11, 2019 • edited Loading

RalfJung commented Sep 14, 2019

Nils-TUD commented Sep 15, 2019

RalfJung commented Sep 15, 2019

RalfJung commented Sep 15, 2019

Nils-TUD commented Sep 16, 2019

RalfJung commented Sep 18, 2019 • edited Loading

RalfJung commented Sep 18, 2019

bors bot commented Sep 18, 2019

Build failed

Nils-TUD commented Sep 18, 2019

RalfJung commented Sep 18, 2019

Nils-TUD commented Sep 19, 2019

RalfJung commented Sep 19, 2019

bors bot commented Sep 19, 2019

Build succeeded

RalfJung commented Sep 19, 2019

Nils-TUD commented Sep 19, 2019

Nils-TUD commented Sep 11, 2019 •

edited

Loading

RalfJung commented Sep 18, 2019 •

edited

Loading