Skip to content

Commit 54921f4

Browse files
committed
Test static and dynamic linking.
1 parent 34bf697 commit 54921f4

File tree

2 files changed

+35
-25
lines changed

2 files changed

+35
-25
lines changed

.travis.yml

+28-13
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,51 @@ env:
1414
- LLVM_VERSION="3.8" BINDGEN_JOB="test" BINDGEN_PROFILE="--release"
1515
- LLVM_VERSION="3.8" BINDGEN_JOB="integration" BINDGEN_PROFILE=
1616
- LLVM_VERSION="3.8" BINDGEN_JOB="integration" BINDGEN_PROFILE="--release"
17-
- LLVM_VERSION="3.8" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE=
18-
- LLVM_VERSION="3.8" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE="--release"
17+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_NO_DEFAULT_FEATURES="1"
18+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_NO_DEFAULT_FEATURES="1"
19+
1920
- LLVM_VERSION="3.9" BINDGEN_JOB="test" BINDGEN_PROFILE=
2021
- LLVM_VERSION="3.9" BINDGEN_JOB="test" BINDGEN_PROFILE="--release"
2122
- LLVM_VERSION="3.9" BINDGEN_JOB="integration" BINDGEN_PROFILE=
2223
- LLVM_VERSION="3.9" BINDGEN_JOB="integration" BINDGEN_PROFILE="--release"
23-
- LLVM_VERSION="3.9" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE=
24-
- LLVM_VERSION="3.9" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE="--release"
24+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_NO_DEFAULT_FEATURES="1"
25+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_NO_DEFAULT_FEATURES="1"
26+
2527
- LLVM_VERSION="4.0" BINDGEN_JOB="test" BINDGEN_PROFILE=
2628
- LLVM_VERSION="4.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release"
2729
- LLVM_VERSION="4.0" BINDGEN_JOB="integration" BINDGEN_PROFILE=
2830
- LLVM_VERSION="4.0" BINDGEN_JOB="integration" BINDGEN_PROFILE="--release"
29-
- LLVM_VERSION="4.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE=
30-
- LLVM_VERSION="4.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE="--release"
31+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_NO_DEFAULT_FEATURES="1"
32+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_NO_DEFAULT_FEATURES="1"
33+
3134
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE=
3235
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release"
3336
- LLVM_VERSION="5.0" BINDGEN_JOB="integration" BINDGEN_PROFILE=
3437
- LLVM_VERSION="5.0" BINDGEN_JOB="integration" BINDGEN_PROFILE="--release"
35-
- LLVM_VERSION="5.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE=
36-
- LLVM_VERSION="5.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE="--release"
38+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_NO_DEFAULT_FEATURES="1"
39+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_NO_DEFAULT_FEATURES="1"
40+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_FEATURES="static" BINDGEN_NO_DEFAULT_FEATURES="1"
41+
- LLVM_VERSION="5.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_FEATURES="static" BINDGEN_NO_DEFAULT_FEATURES="1"
42+
3743
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE=
3844
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release"
39-
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_FEATURES="testing_only_extra_assertions"
40-
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_FEATURES="testing_only_extra_assertions"
4145
- LLVM_VERSION="9.0" BINDGEN_JOB="integration" BINDGEN_PROFILE=
4246
- LLVM_VERSION="9.0" BINDGEN_JOB="integration" BINDGEN_PROFILE="--release"
43-
- LLVM_VERSION="9.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE=
44-
- LLVM_VERSION="9.0" BINDGEN_JOB="nofeatures" BINDGEN_PROFILE="--release"
47+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_NO_DEFAULT_FEATURES="1"
48+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_NO_DEFAULT_FEATURES="1"
49+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_FEATURES="static" BINDGEN_NO_DEFAULT_FEATURES="1"
50+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_FEATURES="static" BINDGEN_NO_DEFAULT_FEATURES="1"
51+
52+
# Testing with extra asserts enabled
53+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE= BINDGEN_FEATURES="testing_only_extra_assertions"
54+
- LLVM_VERSION="9.0" BINDGEN_JOB="test" BINDGEN_PROFILE="--release" BINDGEN_FEATURES="testing_only_extra_assertions"
55+
56+
57+
# Test the expectations build and pass tests.
4558
- LLVM_VERSION="9.0" BINDGEN_JOB="expectations" BINDGEN_PROFILE=
4659
- LLVM_VERSION="9.0" BINDGEN_JOB="expectations" BINDGEN_PROFILE="--release"
60+
61+
# Miscellaneous tests.
4762
- LLVM_VERSION="9.0" BINDGEN_JOB="misc"
4863
- LLVM_VERSION="9.0" BINDGEN_JOB="quickchecking"
4964

@@ -60,7 +75,7 @@ cache:
6075
before_install: . ./ci/before_install.sh
6176

6277
script:
63-
- BINDGEN_JOB="$BINDGEN_JOB" BINDGEN_PROFILE="$BINDGEN_PROFILE" BINDGEN_FEATURES="$BINDGEN_FEATURES" ./ci/script.sh
78+
- BINDGEN_JOB="$BINDGEN_JOB" BINDGEN_PROFILE="$BINDGEN_PROFILE" BINDGEN_FEATURES="$BINDGEN_FEATURES" BINDGEN_NO_DEFAULT_FEATURES="$BINDGEN_NO_DEFAULT_FEATURES" ./ci/script.sh
6479

6580
after_success:
6681
- test "$TRAVIS_PULL_REQUEST" == "false" &&

ci/script.sh

+7-12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ cd "$(dirname "$0")/.."
99

1010
export RUST_BACKTRACE=1
1111

12+
NO_DEFAULT_FEATURES=""
13+
if [ ! -z $BINDGEN_NO_DEFAULT_FEATURES ]; then
14+
NO_DEFAULT_FEATURES=--no-default-features
15+
fi
16+
1217
case "$BINDGEN_JOB" in
1318
"test")
1419
# Need rustfmt to compare the test expectations.
@@ -17,23 +22,13 @@ case "$BINDGEN_JOB" in
1722
rustup component add --toolchain nightly rustfmt
1823
RUSTFMT="$(rustup which rustfmt)"
1924
export RUSTFMT
20-
cargo test "$BINDGEN_PROFILE" --features "$BINDGEN_FEATURES"
25+
cargo test "$BINDGEN_PROFILE" $NO_DEFAULT_FEATURES --features "$BINDGEN_FEATURES"
2126
./ci/assert-no-diff.sh
2227
;;
2328

2429
"integration")
2530
cd ./bindgen-integration
26-
cargo test "$BINDGEN_PROFILE" --features "$BINDGEN_FEATURES"
27-
;;
28-
29-
"nofeatures")
30-
rustup update nightly
31-
rustup component add rustfmt
32-
rustup component add --toolchain nightly rustfmt
33-
RUSTFMT="$(rustup which rustfmt)"
34-
export RUSTFMT
35-
cargo test "$BINDGEN_PROFILE" --no-default-features
36-
./ci/assert-no-diff.sh
31+
cargo test "$BINDGEN_PROFILE" $NO_DEFAULT_FEATURES --features "$BINDGEN_FEATURES"
3732
;;
3833

3934
"expectations")

0 commit comments

Comments
 (0)