Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no-std friendly test suite #155

Merged
merged 24 commits into from
Apr 11, 2017
Merged

no-std friendly test suite #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d40b3b3
move compiler-rt submodule
Apr 10, 2017
cc0d8ba
remove the current test suite
Apr 10, 2017
dbcec72
refactor build.rs to not depend on rustc-cfg
Apr 10, 2017
bd9c835
remove unused Cargo subprojects
Apr 10, 2017
bce5fb5
move the compiler-rt submodule to the root
Apr 10, 2017
a88ea40
rustfmt
Apr 10, 2017
b8e8c7f
no_std compatible tester
Apr 10, 2017
9e2c2b6
test float/conv.rs
Apr 10, 2017
d34c51f
remove arm tests from the old test suite
Apr 10, 2017
3fa2235
make float* intrinsics testable on thumb
Apr 10, 2017
3f723d1
modify the CI setup to run tests on the thumb targets
Apr 10, 2017
55294ba
put test generation behind a Cargo feature
Apr 10, 2017
ebbf8d5
appveyor: cargo test requires the gen-tests feature
Apr 10, 2017
181139a
.travis.yml: thumbs target have been renamed
Apr 10, 2017
d2bf0f9
travis: don't reinstall rustup
Apr 10, 2017
adb4e5c
s/feature/features/g
Apr 11, 2017
33b17fd
ignore i128 div / mul tests on MIPS
Apr 11, 2017
a373683
adapt the thumb target specs to upstream linker-flavor changes
Apr 11, 2017
aa553fe
appveyor: make the host x86_64 when testing the i686 target
Apr 11, 2017
46085a2
i128 test: transmute intrinsic output before comparing
Apr 11, 2017
30b8b43
powershell -> cmd.exe
Apr 11, 2017
63f91a0
Revert "i128 test: transmute intrinsic output before comparing"
Apr 11, 2017
c52f9a0
ignore i128 tests on windows
Apr 11, 2017
44e5a1a
fix cfg syntax
Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .cargo/config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "compiler-rt/compiler-rt-cdylib/compiler-rt"]
path = compiler-rt/compiler-rt-cdylib/compiler-rt
path = compiler-rt
url = https://github.com/rust-lang/compiler-rt
12 changes: 5 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ matrix:
- env: TARGET=powerpc-unknown-linux-gnu
- env: TARGET=powerpc64-unknown-linux-gnu
- env: TARGET=powerpc64le-unknown-linux-gnu
- env: TARGET=thumbv6m-none-eabi
- env: TARGET=thumbv7em-none-eabi
- env: TARGET=thumbv7em-none-eabihf
- env: TARGET=thumbv7m-none-eabi
- env: TARGET=thumbv6m-linux-eabi
- env: TARGET=thumbv7em-linux-eabi
- env: TARGET=thumbv7em-linux-eabihf
- env: TARGET=thumbv7m-linux-eabi
- env: TARGET=x86_64-apple-darwin
os: osx
env: TARGET=x86_64-unknown-linux-gnu
Expand All @@ -34,11 +34,9 @@ before_install:
- test "$TRAVIS_OS_NAME" = "osx" || docker run --rm --privileged multiarch/qemu-user-static:register

install:
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION
- source ~/.cargo/env
- case $TARGET in
x86_64-apple-darwin | x86_64-unknown-linux-gnu) ;;
thumbv*-none-eabi*) rustup component add rust-src ;;
thumbv*eabi*) rustup component add rust-src ;;
*) rustup target add $TARGET;;
esac

Expand Down
21 changes: 11 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,27 @@ name = "compiler_builtins"
version = "0.1.0"

[build-dependencies]
rustc-cfg = "0.3.0"
cast = { version = "0.2.0", optional = true }
rand = { version = "0.3.15", optional = true }

[build-dependencies.gcc]
optional = true
version = "0.3.36"

[dev-dependencies]
quickcheck = "0.3.1"
rand = "0.3.14"
gcc_s = { path = "gcc_s" }
compiler-rt = { path = "compiler-rt" }

[features]
# Build the missing intrinsics from compiler-rt C source code
c = ["gcc"]
# Mark this crate as the #![compiler_builtins] crate
compiler-builtins = []
default = ["compiler-builtins"]
# Include implementations of memory operations like memcpy
mem = []
rustbuild = ["compiler-builtins"]
# generate tests
gen-tests = ["cast", "rand"]

[target.'cfg(all(target_arch = "arm", not(any(target_env = "gnu", target_env = "musl")), target_os = "linux"))'.dev-dependencies]
test = { git = "https://github.com/japaric/utest" }
utest-cortex-m-qemu = { default-features = false, git = "https://github.com/japaric/utest" }
utest-macros = { git = "https://github.com/japaric/utest" }



[workspace]
7 changes: 4 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ environment:
install:
- git submodule update --init
- curl -sSf -o rustup-init.exe https://win.rustup.rs
- rustup-init.exe --default-host %TARGET% --default-toolchain nightly -y
- rustup-init.exe --default-host x86_64-pc-windows-msvc --default-toolchain nightly -y
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- if "%TARGET%"=="i686-pc-windows-msvc" ( rustup target add %TARGET% )
- rustc -Vv
- cargo -V

Expand All @@ -16,5 +17,5 @@ build: false
test_script:
- cargo build --target %TARGET%
- cargo build --release --target %TARGET%
- cargo test --no-default-features --target %TARGET%
- cargo test --no-default-features --release --target %TARGET%
- cargo test --no-default-features --features gen-tests --target %TARGET%
- cargo test --no-default-features --features gen-tests --release --target %TARGET%
Loading