Skip to content

Commit 83887ce

Browse files
authored
Merge pull request #6 from jjs-dev/fix
Rewrite tests and make them pass
2 parents d7c3249 + 69cce87 commit 83887ce

File tree

22 files changed

+615
-365
lines changed

22 files changed

+615
-365
lines changed

.github/workflows/rust.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Run clippy
3333
run: |
3434
rm -rf .cargo
35-
cargo clippy --workspace -- -Dclippy::all
35+
cargo clippy -p minion -p minion-ffi -- -Dclippy::all
3636
check-platform-support:
3737
runs-on: ubuntu-latest
3838
steps:
@@ -45,27 +45,25 @@ jobs:
4545
- name: Check musl
4646
run: |
4747
rustup target add x86_64-unknown-linux-musl
48-
cargo check --workspace --target x86_64-unknown-linux-musl
48+
cargo check -p minion -p minion-ffi --target x86_64-unknown-linux-musl
4949
tests:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- uses: actions/checkout@v2
5353
- uses: actions-rs/toolchain@v1.0.6
5454
with:
55-
toolchain: stable
55+
toolchain: nightly
56+
override: true
5657
- name: Compile tests
5758
run: |
5859
rm -rf .cargo
59-
mkdir build
60-
cd build
61-
cmake ../minion-ffi/tests
62-
cmake --build .
60+
cd minion-tests
61+
TARGET=x86_64-unknown-linux-musl
62+
rustup target add $TARGET
63+
cargo build -Zunstable-options --out-dir=../out --target=$TARGET
6364
- name: Run tests
6465
run: |
65-
cd build
66-
67-
# TODO
68-
# sudo ./mft
66+
sudo ./out/minion-tests
6967
nightly-checks:
7068
runs-on: ubuntu-latest
7169
steps:

Cargo.lock

Lines changed: 102 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ backtrace = "0.3.46"
1818
thiserror = "1.0.15"
1919

2020
[workspace]
21-
members = ["minion-ffi", "."]
21+
members = ["minion-ffi", ".", "minion-tests"]

minion-ffi/tests/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)