Skip to content
Snippets Groups Projects
Verified Commit 26299181 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix issue if test:redox is run without build:redox

parent 00903961
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ 26299181
...@@ -45,7 +45,7 @@ test:redox: ...@@ -45,7 +45,7 @@ test:redox:
variables: variables:
TARGET: x86_64-unknown-redox TARGET: x86_64-unknown-redox
script: script:
- export CARGO="redoxer" - export CARGO_TEST="redoxer"
- export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain" - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
- export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH" - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
- export TEST_RUNNER="redoxer exec --folder . -- sh --" - export TEST_RUNNER="redoxer exec --folder . -- sh --"
......
Makefile
+ 2
− 1
View file @ 26299181
TARGET?= TARGET?=
CARGO?=cargo CARGO?=cargo
CARGO_TEST?=$(CARGO)
CARGOFLAGS= CARGOFLAGS=
RUSTCFLAGS= RUSTCFLAGS=
...@@ -88,7 +89,7 @@ sysroot: all ...@@ -88,7 +89,7 @@ sysroot: all
touch $@ touch $@
test: sysroot test: sysroot
$(CARGO) test $(CARGO_TEST) test
$(MAKE) -C tests verify $(MAKE) -C tests verify
# Debug targets # Debug targets
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment