Skip to content

Commit

Permalink
include all packages in tests and build
Browse files Browse the repository at this point in the history
  • Loading branch information
Schaeff committed Aug 1, 2018
1 parent 41cec98 commit a93bb54
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
@@ -1,7 +1,7 @@
[workspace]

members = [
"zokrates_core",
"zokrates_cli",
"zokrates_fs_resolver",
]

]
7 changes: 2 additions & 5 deletions build.sh
Expand Up @@ -3,11 +3,8 @@
# Exit if any subcommand fails
set -e

cd zokrates_cli
if [ -n "$WITH_LIBSNARK" ]; then
cargo build --features libsnark
else
cargo build
else
cargo -Z package-features build --no-default-features
fi

cd ..
9 changes: 3 additions & 6 deletions full_test.sh
Expand Up @@ -3,11 +3,8 @@
# Exit if any subcommand fails
set -e

cd zokrates_cli
if [ -n "$WITH_LIBSNARK" ]; then
cargo test --features libsnark -- --ignored
else
cargo test -- --ignored
fi

cd ..
else
cargo -Z package-features test --no-default-features -- --ignored
fi
9 changes: 3 additions & 6 deletions test.sh
Expand Up @@ -3,11 +3,8 @@
# Exit if any subcommand fails
set -e

cd zokrates_cli
if [ -n "$WITH_LIBSNARK" ]; then
cargo test --features libsnark
else
cargo test
fi

cd ..
else
cargo -Z package-features test --no-default-features
fi
2 changes: 1 addition & 1 deletion zokrates_cli/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <ma
repository = "https://github.com/JacobEberhardt/ZoKrates.git"

[features]
default = []
default = ["libsnark"]
libsnark = ["zokrates_core/libsnark"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion zokrates_core/src/compile.rs
Expand Up @@ -131,7 +131,7 @@ fn compile_aux<T: Field, R: BufRead, S: BufRead, E: Into<imports::Error>>(reader
mod test {
use super::*;
use field::FieldPrime;
use std::io::{BufRead, BufReader, Empty};
use std::io::{BufReader, Empty};

#[test]
fn no_resolver_with_imports() {
Expand Down
1 change: 1 addition & 0 deletions zokrates_core/src/helpers.rs
Expand Up @@ -156,6 +156,7 @@ mod tests {
use field::FieldPrime;
use super::*;

#[cfg(feature = "libsnark")]
mod sha256libsnark {
use super::*;

Expand Down

0 comments on commit a93bb54

Please sign in to comment.