Skip to content

Commit

Permalink
Merge pull request #32 from striezel-stash/fix-typos
Browse files Browse the repository at this point in the history
fix some typos
  • Loading branch information
waych authored Jun 19, 2021
2 parents ca530b0 + 713efe4 commit 6393bd1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ impl PcFile {
let mut deps = Vec::new();

for line in s.lines() {
// We could collect alot of stuff here, but we only care about Requires and Libs for the moment.
// We could collect a lot of stuff here, but we only care about Requires and Libs for the moment.
if line.starts_with("Requires:") {
let mut requires_args = line
.split(":")
Expand Down
2 changes: 1 addition & 1 deletion tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ for port in harfbuzz ; do
cargo clean --manifest-path $port/Cargo.toml
cargo run --manifest-path $port/Cargo.toml && exit 2
echo THIS FAILURE IS EXPECTED
echo This is to ensure that we are not spuriously succeding because the libraries already exist someone on the build machine.
echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine.
$VCPKG_ROOT/vcpkg install $port
cargo run --manifest-path $port/Cargo.toml
done
4 changes: 2 additions & 2 deletions tests/vcpkgrs_target.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ export VCPKG_ROOT=$SCRIPTDIR/../vcp
export VCPKGRS_TRIPLET=test-triplet
export VCPKG_DEFAULT_TRIPLET=test-triplet

cp $VCPKG_ROOT/triplets/x64-linux.cmake $VCPKG_ROOT/triplets/test-triplet.cmake
cp $VCPKG_ROOT/triplets/x64-linux.cmake $VCPKG_ROOT/triplets/test-triplet.cmake
for port in harfbuzz ; do
# check that the port fails before it is installed
$VCPKG_ROOT/vcpkg remove --no-binarycaching $port || true
cargo clean --manifest-path $port/Cargo.toml
cargo run --manifest-path $port/Cargo.toml && exit 2
echo THIS FAILURE IS EXPECTED
echo This is to ensure that we are not spuriously succeding because the libraries already exist someone on the build machine.
echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine.
# disable binary caching because it breaks this build as of vcpkg 53e6588 (since vcpkg 52a9d9a)
$VCPKG_ROOT/vcpkg install --no-binarycaching $port
cargo run --manifest-path $port/Cargo.toml
Expand Down

0 comments on commit 6393bd1

Please sign in to comment.