diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a30682c83042ceb3695d150d26bd884c2c32f0da..efc8ceff63858c8bc5ce7e023c605d3e96be8852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,7 @@ test:redox: variables: TARGET: x86_64-unknown-redox script: + - export CARGO="redoxer" - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain" - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH" - export TEST_RUNNER="redoxer exec --folder . -- sh --" diff --git a/Makefile b/Makefile index 96adeae3d966a68d3c5498f5670b368f9e13c780..177d20bfb415ae538712ef140f46427fea71a9df 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,7 @@ sysroot: all touch $@ test: sysroot + $(CARGO) test $(MAKE) -C tests verify # Debug targets