Commit graph

172 commits

Author SHA1 Message Date
hi-rustin a2f903275a Detect incorrectly named cargo.toml for install --path 2021-06-22 15:31:28 +08:00
hi-rustin d9daaf7a84 Detect incorrectly named cargo.toml for install --git 2021-06-22 15:31:21 +08:00
hi-rustin 5e86dd455d Add more details when installing git repository errors 2021-06-14 14:41:49 +08:00
Eric Huss 9387a308f4 Fix cargo install with a semver metadata version. 2021-05-08 17:21:52 -07:00
Kornel 6977dee109 Explain cargo install is not for libraries 2021-03-03 17:10:56 +00:00
Horaci Macias dab646eee0 Do not exit prematurely if anything failed installing.
https://github.com/rust-lang/cargo/issues/9180
2021-02-19 09:53:46 +01:00
CPerezz b526fadca4
Impl warn for locked install withoud Cargo.lock
If we're installing in --locked mode and there's no `Cargo.lock` published
ie. the bin was published before https://github.com/rust-lang/cargo/pull/7026
the cargo install errors were not stating that it was due to the lack of
the `Cargo.lock` file. Instead, the error seemed completely unrelated.

Therefore, this tries to address this by adding a warn in the stderr
output.

Closes #9106
2021-01-30 01:09:16 +01:00
Eric Huss b04c7fb849 Add suggestion for bad package id. 2021-01-22 13:38:53 -08:00
Weihang Lo b9554f37ab
rustfmt 2020-10-28 02:57:22 +08:00
Weihang Lo 9d9c321c27
test: check cargo uninstall package opt with empty value 2020-10-28 02:46:20 +08:00
Eric Huss 6f8c7d5a87 Normalize raw string indentation. 2020-09-26 17:59:58 -07:00
bors f110fd9fc1 Auto merge of #8681 - weihanglo:fix/redundant-messsage-local-crate-install, r=ehuss
Sweep unrelated message from unnecessary workspace infromation

Resolves #8619

Only pass workspace information when the source is from a local crate installation.
2020-09-10 18:40:48 +00:00
Weihang Lo a527caa248
test: check stderr containment explicitly 2020-09-10 07:57:57 +08:00
Weihang Lo 45cfd0cd12
Fix formatting 2020-09-10 00:26:30 +08:00
Weihang Lo 71cae39de0
Test for crate installation without emitting messages from cwd 2020-09-10 00:20:35 +08:00
bors 875e012325 Auto merge of #8655 - camelid:patch-1, r=ehuss
Lowercase and remove periods in error messages for consistency
2020-09-08 20:17:21 +00:00
Camelid 82c834cec2 Update tests 2020-09-07 10:57:00 -07:00
Philipp Oppermann c5d8dcb323 Reload unstable table from config file in reload_rooted_at 2020-08-27 11:07:53 +02:00
bishtpawan 3952fdb223 Refactor code and resolve PR comments 2020-08-05 17:46:33 +05:30
bishtpawan dd654d5576 Add pattern match for yank check and updated corresponding test cases 2020-08-05 17:31:56 +05:30
bishtpawan 844cde203f Add test case for yank validation check 2020-08-05 17:31:56 +05:30
bl2e 538d925920 Fix post-execution path checks to be compatible with Windows 2020-06-20 23:37:56 -07:00
bl2e bb3754276a Fix test compatibility for Windows 2020-06-20 23:01:35 -07:00
bl2e 1f2de1e0a7 Add test for cargo install option --target-dir 2020-06-20 17:50:20 -07:00
kellda 1e0d38061c Add test for cargo install --index 2020-06-10 15:26:26 +00:00
Eric Huss 80e55c774b Fix tests with enoent error message on non-english systems. 2020-05-29 12:34:17 -07:00
Daniel Wagner-Hall 556c236f9a Bump to semver 0.10 for VersionReq::is_exact
This stops using `to_string` as a proxy for this now-provided precise API.

This reverts commit b71927224f and bupms the
dependency version in Cargo.toml.
2020-05-25 11:11:45 +01:00
Daniel Wagner-Hall b71927224f Switch to using existing is_locked implementation
semver hasn't merged the upstream PR (yet)
2020-05-20 20:38:23 +01:00
Daniel Wagner-Hall 624ce68126 Merge branch 'master' into trywithout 2020-05-02 11:50:14 +01:00
Eric Huss 5bd74c41c4 Fix error with git repo discovery and symlinks. 2020-04-30 13:45:58 -07:00
Daniel Wagner-Hall ad065e7414 Merge branch 'master' into trywithout 2020-04-20 22:52:35 +01:00
Odin Dutton 0c14dc2e74 Improve error message when running cargo install . 2020-04-20 13:16:11 +10:00
Eric Huss 4ae79d2ffd Use fs helpers instead of File functions. 2020-04-17 07:56:16 -07:00
Daniel Wagner-Hall 137e518d98 Explicitly check whether installed first instead 2020-03-21 00:04:17 +00:00
Matthias Krüger 1d912002e9 fix most remaining clippy findings (mostly redundant imports) 2020-02-21 12:15:16 +01:00
Christian Duerr ae8dee513d
Test that git install reads virtual manifest 2020-01-20 00:41:30 +01:00
Christian Duerr a08fe088b3
Fix failing test 2020-01-20 00:41:30 +01:00
Eric Huss 00a47302dd Fixes for some test errors on Windows. 2019-12-19 09:44:02 -08:00
Eric Huss 83571aee56 Minor testsuite organization. 2019-11-24 18:42:45 -08:00
Eric Huss f7b29716ed Stabilize install-upgrade. 2019-11-11 14:47:48 -08:00
Eric Huss d6d15141f8 Wrap some really long lines.
These do not wrap due to https://github.com/rust-lang/rustfmt/issues/3863.
2019-10-18 15:17:59 -07:00
Jonas Schievink 26229cd8ad Uncapitalize "Could not compile" error message
"could not compile ..." matches other Cargo and rustc errors and
warnings better.
2019-09-17 00:50:49 +02:00
Alex Crichton ebd10526f3 Run rustfmt 2019-09-16 12:00:12 -07:00
Alex Crichton 9115b2c326 Extract support directory to its own crate
Extract out all our test support code to its own standalone crate so it
can be shared between multiple test suites if necessary.
2019-09-16 11:47:09 -07:00
Eric Huss 5a59b80966 cargo install: Remove orphaned executables. 2019-08-12 21:44:14 -07:00
Eric Huss a4e9611453 Fix some formatting for some strings. 2019-07-13 16:00:47 -07:00
Jethro Beekman 0e0d968825 Update #[test] attribute on all tests in the testsuite
sed -i 's/^#\[test\]/#[cargo_test]/' $(rg -l '^#\[test\]')

Manual fixes:
* proc_macro::proc_macro_doctest
2019-06-07 12:41:26 -07:00
Eric Huss 87449f453b Remove unnecessary calls to masquerade_as_nightly_cargo.
These are not needed anymore.
2019-05-09 10:58:18 -07:00
Eric Huss eae89007a6 Make --locked required for cargo install --path, too. 2019-04-16 08:54:24 -07:00
Eric Huss 3d89379367 cargo install: Ignore Cargo.lock for non --path installs.
Requires `--locked` to use Cargo.lock for registry and git installs.
2019-04-16 08:54:24 -07:00
Eric Huss e023a6672b Add install-upgrade. 2019-04-02 08:40:34 -07:00
Eric Huss fe8f29432d Allow cargo install --path P to load config from P. 2019-03-31 17:13:44 -07:00
Eric Huss 0b2b10b73c Cleanup: Misc. 2019-03-26 19:06:08 -07:00
Eric Huss 50277e88fe Testsuite: remove some unnecessary is_nightly checks. 2019-03-26 13:56:14 -07:00
Eric Huss e7124ba262 Testsuite: Make cwd() relative to project root.
It's a fairly common pattern, and it seemed natural to me.
2019-03-20 16:34:56 -07:00
Alexander Regueiro f7c91ba622
Various cosmetic improvements. 2019-02-20 10:58:27 +00:00
Eric Huss 3378a5a15c Better error message for bad manifest with cargo install.
The old code assumed that any error loading a manifest meant that the
manifest didn't exist, but there are many other reasons it may fail.
Add a few helpful messages for some common cases.
2019-01-17 12:59:43 -08:00
Eric Huss f58d107e7c testsuite: Require failing commands to check output. 2018-12-28 17:59:36 -08:00
Alex Crichton fecb724643 Format with cargo fmt 2018-12-08 03:19:47 -08:00
Dale Wijnand 04ddd4d0fc
Upgrade to Rust 2018 2018-12-06 20:18:35 +01:00
bors 18c8c5fb99 Auto merge of #6065 - zachlute:change-project-to-package, r=dwijnand
Replace 'project' with 'package' in many strings and comments.

Partial fix for #6056.

Shouldn't be anything too interesting or surprising in here.

Still need to do documentation, but will do that as a different PR.
2018-09-21 23:34:08 +00:00
Alex Crichton d9534bf498 Only load ~/.cargo/config for cargo install
This commit tweaks how configuration is loaded for `cargo install`, ensuring
that we only load configuration from `$HOME` instead of the current working
directory. This should make installations a little more consistent in that they
probably shouldn't cover project-local configuration but should respect global
configuration!

Closes #6025
2018-09-21 13:21:32 -07:00
Zach Lute 3492a3905c Replace 'project' with 'package' in many strings and comments. 2018-09-20 23:47:09 -07:00
Dale Wijnand 494fdabe2f
If creating a new GitSource, updating it is required before querying it 2018-09-20 11:10:24 +01:00
Alex Crichton e2637b6599 Review comments! 2018-09-18 11:33:18 -07:00
Zach Lute b020d3789a Resolve merge conflicts with test string changes. 2018-09-09 16:48:57 -07:00
bors 5984312202 Auto merge of #5990 - dwijnand:no-crates.io-index-url, r=alexcrichton
Don't print crates.io-index URL when Updating

Following the lead from PackageId's Display, only display the registry's
URL if it's not the default registry (aka crates.io).

Before:

    $ cargo install lazy_static
        Updating registry `https://github.com/rust-lang/crates.io-index`

After:

    $ dcargo install lazy_static
        Updating crates.io index

Fixes #4208
2018-09-09 21:06:13 +00:00
Dale Wijnand 41aa6fbab4
Update tests to new Updating msg format 2018-09-08 10:23:57 +01:00
Zach Lute 89f43938fe Print file paths instead of file:// URLs.
This change ensures cargo will output file paths in the expected format
(C:\foo\... on Windows, /foo/... elsewhere). Previously it would output
file:// URLs instead.

To support this change, additional changes were made to the test suite
string processing such that [ROOT] is now replaced with the appropriate
file path root for the platform.

The CWD template was also updated to use [CWD] like other replacement
templates and to do the replacement on the expected value rather than
the actual value to avoid replacing things we don't expect with CWD.
2018-09-07 19:42:59 -07:00
Dale Wijnand 3b786a0dfd
Simplify test::install_ignores_cargo_config 2018-09-06 07:37:01 +01:00
Dale Wijnand d036024000
Fix change in install::install_ignores_cargo_config 2018-09-06 07:36:54 +01:00
Dale Wijnand 4415c72828
Remove/reworksome redundant .cwd(p.root()) in tests 2018-09-06 01:12:53 +01:00
Matthias Krüger 2cd9cce6e3 clippy: resolve all warnings about useless format!() 2018-09-03 11:38:29 +02:00
Jorge Aparicio 942e3672a6 fix unit test 2018-09-01 18:16:49 +02:00
Jorge Aparicio e53d31ed91 fix test source 2018-09-01 18:12:22 +02:00
Jorge Aparicio e620865633 make cargo install ignore .cargo/config
closes #5850
2018-09-01 18:12:22 +02:00
Dale Wijnand d5fc8dc3a7
Introduce the CWD macro in test output asserting
Avoids dealing with things like CWD changing.
2018-08-30 11:05:29 +02:00
Dale Wijnand f009dc4e1b
Remove hamcrest has_installed_exe & is_not 2018-08-29 10:26:12 +02:00
Dale Wijnand 6fd1b54c65
Remove hamcrest existing_dir() 2018-08-29 07:53:01 +02:00
Dale Wijnand 85984a8700
Migrate from tests fom assert_that/execs to .run() 2018-08-28 15:08:12 +02:00
bors 8537ab9131 Auto merge of #5927 - dwijnand:uninstall-cwd, r=ehuss
Make "cargo uninstall" uninstall the cwd bins

Fixes #5916

Tested with a local build of cargo, using coreutils:

    17:33:57 $ dcargo uninstall
    Removing /Users/dnw/.cargo/bin/uutils
2018-08-23 16:25:14 +00:00
Dale Wijnand d87951aa73
Handle Window's missing file error message 2018-08-23 15:05:49 +01:00
Dale Wijnand 8921abd791
Make "cargo uninstall" uninstall the cwd bins 2018-08-23 10:57:36 +01:00
Dale Wijnand fc93b0f941
Improve the cargo install deprecation messaging 2018-08-22 09:46:50 +01:00
Dale Wijnand 16aeb0cd4f
Default test support's Execs to exit code 0 2018-08-03 07:44:42 +01:00
Dale Wijnand f88ff968ed
Fix install_empty_argument by passing an empty arg 2018-08-02 18:00:02 +01:00
Dale Wijnand 8940d30668
Make cargo_process take a string it splits on whitespace 2018-08-02 18:00:02 +01:00
Dale Wijnand 2fe2ea9e71
Use p.cargo's ability to split on whitespace more 2018-08-02 15:18:44 +01:00
Dale Wijnand ca7d9ee292
Declare one-line files on one line, in test projects 2018-07-25 09:58:50 +01:00
Dale Wijnand ab19c48358
Dedup a bunch more manifest 2018-07-25 00:43:30 +01:00
Dale Wijnand 081e7930d2
Drop now unnecessary basic manifests 2018-07-24 16:33:55 +01:00
Dale Wijnand 43b42d6f4c
Reorganise the testsuite crate module hierarchy
* Collapse the nested cargotest::support module into the cargotest
  module (merge the mod.rs's)
* Rename the cargotest module to support
* Nest the top-level hamcrest module into support
2018-07-22 08:46:44 +01:00
Dale Wijnand 7fe2fbc8a3
Remove the argument from the project test support function
By rewriting the tests, with rerast (https://github.com/google/rerast),
to use the newly introduced "at" method.

First I added the following temporary function to cargotest::support:

    pub fn project_foo() -> ProjectBuilder {
        project("foo")
    }

Then I defined the following rewrite.rs:

    use cargotest::support::{ project, project_foo };

    fn rule1(a: &'static str) {
        replace!(project("foo") => project_foo());
        replace!(project(a) => project_foo().at(a));
    }

Then I ran rerast:

    cargo +nightly rerast --rules_file=rewrite.rs --force --targets tests --file tests/testsuite/main.rs

Finally I searched and replaced the references to project_foo with
argument-less project (a little awkardly on macOS with a git clean).

    find tests -type f -exec sed -i -e 's/project_foo/project/g' {} +
    git clean -d tests
2018-07-20 13:31:50 +01:00
Alex Crichton d1ef031a62 Fix cargo install using a workspace target dir
Closes #5662
2018-07-05 12:06:26 -07:00
Ximin Luo 0774e97da3 Support cross-compile install 2018-06-28 18:57:24 -07:00
Ximin Luo 3b94f44ec4 Revert "cargo install will ignore the target triple specified in a project directory"
This reverts commit 1bad99180a.
2018-06-28 18:34:12 -07:00
bors 561beb22d2 Auto merge of #5606 - vramana:fix/cargo-install, r=alexcrichton
`cargo install` will ignore the target triple specified in a project directory

Fixes #5441
2018-06-27 16:10:08 +00:00
Ramana Venkata 1bad99180a cargo install will ignore the target triple specified in a project directory
Fixes #5441
2018-06-17 19:49:31 +05:30
Aleksey Kladov 1c15c722fe Install pre-release versions by default for git deps
closes #5627
2018-06-11 21:47:09 +03:00
Mateusz Mikuła 059107e1a0 Always replace metadata when replacing package
Fixes https://github.com/rust-lang/cargo/issues/4582
2018-05-25 14:37:40 +02:00