Skip to content

Commit

Permalink
Merge #467: Add NIGHTLY variable to CI script
Browse files Browse the repository at this point in the history
5f611f6 Conditionally compile the hex macro (Tobin C. Harding)
69349a8 Add NIGHTLY variable to CI script (Tobin C. Harding)

Pull request description:

  We are currently using the DO_BENCH variable as a proxy for whether or not we are using a nightly toolchain, while this is technically correct we use it from within an if guarded statement that is guarded by DO_FEATURE_MATRIX and we never run the CI script with _both_ of these variables set to true. This means that the all features test is never being run.

  Add a NIGHTLY variable and set it based on the output of `cargo --version`.

  This PR catches the bug fixed in: #466 as such it will not be able to be merged until #466 merges.

ACKs for top commit:
  apoelstra:
    ACK 5f611f6

Tree-SHA512: 231bbff8e8944026183a87f681c2d7152c4dcfaaafb6cbd99404e8912d61dbc53c40bb24473c156e893c5b8de79462cb944ed94ffe5429f8b31eaef76dbc0694
  • Loading branch information
apoelstra committed Jun 29, 2022
2 parents 5f59820 + 5f611f6 commit ce8883c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion contrib/test.sh
Expand Up @@ -17,6 +17,12 @@ fi
cargo --version
rustc --version

# Work out if we are using a nightly toolchain.
NIGHTLY=false
if cargo --version | grep nightly; then
NIGHTLY=true
fi

# Test if panic in C code aborts the process (either with a real panic or with SIGILL)
cargo test -- --ignored --exact 'tests::test_panic_raw_ctx_should_terminate_abnormally' 2>&1 | tee /dev/stderr | grep "SIGILL\\|panicked at '\[libsecp256k1\]"

Expand Down Expand Up @@ -51,7 +57,7 @@ if [ "$DO_FEATURE_MATRIX" = true ]; then
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS=$RUSTFLAGS cargo test --all --features="$FEATURES"
cargo test --all --features="rand serde"

if [ "$DO_BENCH" = true ]; then # proxy for us having a nightly compiler
if [ "$NIGHTLY" = true ]; then
cargo test --all --all-features
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS='--cfg=fuzzing' cargo test --all --all-features
fi
Expand Down
1 change: 1 addition & 0 deletions src/key.rs
Expand Up @@ -1651,6 +1651,7 @@ mod test {
use crate::Error::{InvalidPublicKey, InvalidSecretKey};
use crate::Scalar;

#[cfg(not(fuzzing))]
macro_rules! hex {
($hex:expr) => ({
let mut result = vec![0; $hex.len() / 2];
Expand Down

0 comments on commit ce8883c

Please sign in to comment.