Skip to content

Commit

Permalink
Make feature tests always run with std enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
Ogeon committed Aug 11, 2019
1 parent 2818721 commit b449d5e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions palette/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ build = "build/main.rs"
default = ["named_from_str", "std"]
named_from_str = ["named", "phf", "phf_codegen", "std"]
named = []
std = ["approx/std", "num-traits/std"]
serializing = ["serde", "std"]

#internal
strict = []
#ignore in feature test
std = ["approx/std", "num-traits/std"]
strict = [] # Only for CI internal testing

[dependencies]
palette_derive = {version = "0.4.1", path = "../palette_derive"}
Expand Down
4 changes: 2 additions & 2 deletions scripts/test_features.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
features=""

#Features that will always be activated
required_features="strict"
required_features="std strict"


#Find features
Expand All @@ -14,7 +14,7 @@ current_dependency=""
while read -r line || [[ -n "$line" ]]; do
if [[ "$line" == "[features]" ]]; then
walking_features=true
elif [[ $walking_features == true ]] && [[ "$line" == "#internal" ]]; then
elif [[ $walking_features == true ]] && [[ "$line" == "#ignore in feature test" ]]; then
walking_features=false
elif [[ $walking_features == true ]] && echo "$line" | grep -E "^\[.*\]" > /dev/null; then
walking_features=false
Expand Down

0 comments on commit b449d5e

Please sign in to comment.