From 5d03c2a3ba29f400b297549dbbe7f978585fcdc0 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Mon, 13 Mar 2017 22:07:56 -0700 Subject: [PATCH 1/3] 2nd attempt at fixing Travis config Test nightly features on nightly channel. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 082ae3b..38c6fd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rust: env: - TEST_COMMAND=test FEATURES='yolocrypto' - - TEST_COMMAND=test FEATURES='yolocrypto radix_51' + - TEST_COMMAND=test FEATURES='yolocrypto nightly' - TEST_COMMAND=bench FEATURES='yolocrypto bench' matrix: @@ -20,11 +20,11 @@ matrix: env: TEST_COMMAND=bench FEATURES='yolocrypto bench' - rust: beta env: TEST_COMMAND=bench FEATURES='yolocrypto bench' - # radix_51 requires nightly for u128 + # Test nightly features, such as radix_51, only on nightly. - rust: stable - env: TEST_COMMAND=test FEATURES='yolocrypto radix_51' + env: TEST_COMMAND=test FEATURES='yolocrypto nightly' - rust: beta - env: TEST_COMMAND=test FEATURES='yolocrypto radix_51' + env: TEST_COMMAND=test FEATURES='yolocrypto nightly' script: - cargo $TEST_COMMAND --features="$FEATURES" From 383750119b2c30ee5cd1b689bdc31852ab025dd0 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Mon, 13 Mar 2017 22:21:57 -0700 Subject: [PATCH 2/3] Benchmark with nightly features --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38c6fd3..9e49f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ rust: env: - TEST_COMMAND=test FEATURES='yolocrypto' - TEST_COMMAND=test FEATURES='yolocrypto nightly' - - TEST_COMMAND=bench FEATURES='yolocrypto bench' + - TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' matrix: exclude: @@ -17,9 +17,9 @@ matrix: # run benchmarks, which causes dalek not to build on stable. See # https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562 - rust: stable - env: TEST_COMMAND=bench FEATURES='yolocrypto bench' + env: TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' - rust: beta - env: TEST_COMMAND=bench FEATURES='yolocrypto bench' + env: TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' # Test nightly features, such as radix_51, only on nightly. - rust: stable env: TEST_COMMAND=test FEATURES='yolocrypto nightly' From 35db90c4f3226d22800968f254930f6b185c1663 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Mon, 13 Mar 2017 22:29:39 -0700 Subject: [PATCH 3/3] Benchmark both implementations --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9e49f62..526648e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rust: env: - TEST_COMMAND=test FEATURES='yolocrypto' - TEST_COMMAND=test FEATURES='yolocrypto nightly' + - TEST_COMMAND=bench FEATURES='yolocrypto bench' - TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' matrix: @@ -16,6 +17,10 @@ matrix: # stable and beta, but currently we require "test" feature in order to # run benchmarks, which causes dalek not to build on stable. See # https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562 + - rust: stable + env: TEST_COMMAND=bench FEATURES='yolocrypto bench' + - rust: beta + env: TEST_COMMAND=bench FEATURES='yolocrypto bench' - rust: stable env: TEST_COMMAND=bench FEATURES='yolocrypto nightly bench' - rust: beta