From a322cf57ce4ed454ccaca06391ddabaad57413a0 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Wed, 24 Jul 2019 18:15:44 +0200
Subject: [PATCH] ssztests, transitiontests: remove spectests feature
Directly put everything under test cfg
---
.gitlab-ci.yml | 2 +-
yamltests/ssztests/Cargo.toml | 3 ---
yamltests/ssztests/src/main.rs | 2 +-
yamltests/transitiontests/Cargo.toml | 3 ---
yamltests/transitiontests/src/lib.rs | 12 ------------
yamltests/transitiontests/src/main.rs | 2 +-
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 167fa155..2e15d54d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ test-rust-stable:
script:
- ./scripts/init.sh
- ./scripts/build.sh
- - time cargo test --all --release --features spectests --locked
+ - time cargo test --all --release --locked
- sccache -s
only:
- triggers
diff --git a/yamltests/ssztests/Cargo.toml b/yamltests/ssztests/Cargo.toml
index fa9b9e7e..72b3ae12 100644
--- a/yamltests/ssztests/Cargo.toml
+++ b/yamltests/ssztests/Cargo.toml
@@ -14,6 +14,3 @@ beacon = { path = "../../beacon" }
crypto = { package = "shasper-crypto", path = "../../crypto" }
hex = "0.3"
sha2 = "0.8"
-
-[features]
-spectests = []
diff --git a/yamltests/ssztests/src/main.rs b/yamltests/ssztests/src/main.rs
index 32330fe3..d4f2c894 100644
--- a/yamltests/ssztests/src/main.rs
+++ b/yamltests/ssztests/src/main.rs
@@ -137,7 +137,7 @@ fn main() {
}
}
-#[cfg(all(test, feature = "spectests"))]
+#[cfg(test)]
mod spectests {
use super::*;
use std::path::PathBuf;
diff --git a/yamltests/transitiontests/Cargo.toml b/yamltests/transitiontests/Cargo.toml
index d3e2ad6e..c2243942 100644
--- a/yamltests/transitiontests/Cargo.toml
+++ b/yamltests/transitiontests/Cargo.toml
@@ -12,6 +12,3 @@ clap = "2.32"
ssz = { path = "../../utils/ssz" }
beacon = { path = "../../beacon" }
crypto = { package = "shasper-crypto", path = "../../crypto" }
-
-[features]
-spectests = []
diff --git a/yamltests/transitiontests/src/lib.rs b/yamltests/transitiontests/src/lib.rs
index af3b7a7a..9186bc6a 100644
--- a/yamltests/transitiontests/src/lib.rs
+++ b/yamltests/transitiontests/src/lib.rs
@@ -77,15 +77,3 @@ pub fn run_collection<T: Test>(coll: Collection<T>) {
test.run();
}
}
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use beacon::MinimalConfig;
-
- #[test]
- fn deposit_small() {
- let coll = serde_yaml::from_str(&include_str!("../../spectests/tests/operations/deposit/deposit_minimal.yaml")).unwrap();
- run_collection::<DepositTest<MinimalConfig>>(coll);
- }
-}
diff --git a/yamltests/transitiontests/src/main.rs b/yamltests/transitiontests/src/main.rs
index feb11b25..01a758b2 100644
--- a/yamltests/transitiontests/src/main.rs
+++ b/yamltests/transitiontests/src/main.rs
@@ -63,7 +63,7 @@ fn run<T: Test + DeserializeOwned>(file: File) {
run_collection(coll);
}
-#[cfg(all(test, feature = "spectests"))]
+#[cfg(test)]
mod spectests {
use super::*;
use std::path::PathBuf;
--
GitLab