From b6cd29182e464c04e738fb6a999594ff7c31341e Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Mon, 22 Jul 2019 14:55:13 -0400
Subject: [PATCH] ci: Test rather than check for redox
---
.gitlab-ci.yml | 2 +-
examples/window.rs | 13 +------------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99b37296..b0e71278 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ redox:
- mkdir .cargo
- echo 'paths = [ "libc", "nix" ]' >> .cargo/config
script:
- - redoxer check
+ - redoxer test
pages:
image: hrektts/mdbook
diff --git a/examples/window.rs b/examples/window.rs
index f30ca735..48e65717 100644
--- a/examples/window.rs
+++ b/examples/window.rs
@@ -1,25 +1,14 @@
// This is based on the sprite example from piston-examples, available at https://github.com/PistonDevelopers/piston-examples
-#[cfg(not(target_os = "redox"))]
-use std::{cell::RefCell, fs::File, path::Path, rc::Rc};
-
-#[cfg(not(target_os = "redox"))]
use ai_behavior::{Action, Sequence, Wait, WaitForever, While};
-#[cfg(not(target_os = "redox"))]
use ion_shell::{
builtins::{BuiltinFunction, Status},
types, Shell,
};
-#[cfg(not(target_os = "redox"))]
use piston_window::*;
-#[cfg(not(target_os = "redox"))]
use sprite::*;
+use std::{cell::RefCell, fs::File, path::Path, rc::Rc};
-#[cfg(target_os = "redox")]
-// Don't run the test on redox
-fn main() {}
-
-#[cfg(not(target_os = "redox"))]
fn main() {
// This is specific to piston. It does not matter
// Skip to the next *****
--
GitLab