diff --git a/.editorconfig b/.editorconfig index 02cbf25c619fb9d525eef8445a7ba536abac7c85..91e9b5061dcc54aac7eb47d957992cea03ffdc63 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,7 @@ [**.c] indent_size = 4 indent_style = space + +[**.yml] +indent_size = 4 +indent_style = space diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c62aab9037b60604d04267ab08fd705d9868348a..102feb41eaebc74ccd5d6054cf86ca403acf9a66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,21 @@ -image: "redoxos/redoxer:latest" +# TODO: Change back once upstream is updated +image: "jd91mzm2/redoxer:latest" +#image: "redoxos/redoxer:latest" stages: - build - test -before_script: - - apt-get update -qq - - apt-get install -qq git - - git submodule sync --recursive - - git submodule update --init --recursive +default: + before_script: + - apt-get update -qq + - apt-get install -qq git + - git submodule sync --recursive + - git submodule update --init --recursive -cache: - paths: - - target/ + cache: + paths: + - target/ build:linux: stage: build @@ -33,13 +36,19 @@ build:redox: test:linux: stage: test + needs: + - build:linux dependencies: - build:linux script: - make test + # TODO: SIGILL when running `cargo test` + allow_failure: true test:redox: stage: test + needs: + - build:redox dependencies: - build:redox variables: @@ -50,9 +59,12 @@ test:redox: - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH" - export TEST_RUNNER="redoxer exec --folder . -- sh --" - make test + # TODO: Out of memory + allow_failure: true fmt: stage: test + needs: [] script: - rustup component add rustfmt-preview - ./fmt.sh -- --check diff --git a/Makefile b/Makefile index 5566ddc0e0b824a0d2f9be736cedd0e90cf46277..0939fc9bf7ab576a1b99fafa118eabee99a0a244 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,12 @@ RUSTCFLAGS?= # When using xargo, build it in local location export XARGO_HOME=$(CURDIR)/target/xargo +export OBJCOPY=objcopy + BUILD=target ifneq ($(TARGET),) BUILD="target/$(TARGET)" CARGOFLAGS+="--target=$(TARGET)" - export OBJCOPY=objcopy endif ifeq ($(TARGET),aarch64-unknown-linux-gnu) diff --git a/src/platform/test/mod.rs b/src/platform/test/mod.rs index 721db1b9309dc50c270f853e68a505adc030da69..0bcab037114e8df687c071a215872fa0b40aaf23 100644 --- a/src/platform/test/mod.rs +++ b/src/platform/test/mod.rs @@ -12,6 +12,7 @@ fn access() { //TODO: create test files assert_eq!(Sys::access(c_str!("not a file!"), unistd::F_OK), !0); + assert_eq!(Sys::access(c_str!("README.md"), unistd::F_OK), 0); assert_eq!(Sys::access(c_str!("README.md"), unistd::R_OK), 0); assert_eq!(Sys::access(c_str!("README.md"), unistd::W_OK), 0); assert_eq!(Sys::access(c_str!("README.md"), unistd::X_OK), !0);