diff --git a/e2e-tests/manifests/strategies-test-Cargo2.toml b/e2e-tests/manifests/strategies-test-Cargo2.toml new file mode 100644 index 00000000..aef2811e --- /dev/null +++ b/e2e-tests/manifests/strategies-test-Cargo2.toml @@ -0,0 +1,19 @@ +[package] +name = "cargo-update" +repository = "https://github.com/nabijaczleweli/cargo-update" +version = "11.1.2" + +[[bin]] +name = "cargo-install-update" +path = "src/main.rs" +test = false +doc = false + +[[bin]] +name = "cargo-install-update-config" +path = "src/main-config.rs" +test = false +doc = false + +[package.metadata.binstall] +disabled-strategies = ["quick-install"] diff --git a/e2e-tests/strategies.sh b/e2e-tests/strategies.sh index 583d8d14..981ce188 100755 --- a/e2e-tests/strategies.sh +++ b/e2e-tests/strategies.sh @@ -50,10 +50,17 @@ if [ "$exit_code" != 94 ]; then exit 1 fi -set -euxo pipefail +set +e + +"./$1" binstall --disable-strategies compile --no-confirm --manifest-path "manifests/strategies-test-Cargo2.toml" cargo-update@11.1.2 +exit_code="$?" + +set -e + +if [ "$exit_code" != 94 ]; then + echo "Expected exit code 94, but actual exit code $exit_code" + exit 1 +fi ## Test --strategies overriding `disabled-strategies=["compile"]` in Cargo.toml "./$1" binstall --no-confirm --manifest-path "manifests/strategies-test-override-Cargo.toml" --strategies compile cargo-quickinstall@0.2.10 - -## Test --disable-strategies overriding `disabled-strategies=["compile"]` in Cargo.toml - "./$1" binstall --no-confirm --manifest-path "manifests/strategies-test-override-Cargo.toml" --disable-strategies crate-meta-data,quick-install --force cargo-quickinstall@0.2.10