From c284d7364bb306fb03926f0ab6075814076a7f12 Mon Sep 17 00:00:00 2001 From: eV Date: Fri, 16 Aug 2019 17:11:30 +0000 Subject: [PATCH] add conditionals so wasm tests build / run in the right places --- ci/travis.sh | 20 +++++++++++--------- tests/wasm.rs | 45 ++++++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ci/travis.sh b/ci/travis.sh index 2a932712b9..be74b118b2 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -48,15 +48,17 @@ build_and_test() { channel build -v --no-default-features --features serde,rustc-serialize TZ=Asia/Katmandu channel test -v --no-default-features --features serde,rustc-serialize --lib - # wasm tests - touch tests/wasm.rs # ensure rebuild happens so TZ / NOW take effect - TZ=ACST-9:30 NOW=$(date +%s) wasm-pack test --node - touch tests/wasm.rs - TZ=EST4 NOW=$(date +%s) wasm-pack test --node - touch tests/wasm.rs - TZ=UTC0 NOW=$(date +%s) wasm-pack test --node - touch tests/wasm.rs - TZ=Asia/Katmandu NOW=$(date +%s) wasm-pack test --node + if [ -n "${TRAVIS}" ]; then + # wasm tests + touch tests/wasm.rs # ensure rebuild happens so TZ / NOW take effect + TZ=ACST-9:30 NOW=$(date +%s) wasm-pack test --node + touch tests/wasm.rs + TZ=EST4 NOW=$(date +%s) wasm-pack test --node + touch tests/wasm.rs + TZ=UTC0 NOW=$(date +%s) wasm-pack test --node + touch tests/wasm.rs + TZ=Asia/Katmandu NOW=$(date +%s) wasm-pack test --node + fi if [[ "$CHANNEL" == stable ]]; then if [[ -n "$TRAVIS" ]] ; then diff --git a/tests/wasm.rs b/tests/wasm.rs index 21935480e7..757f02e456 100644 --- a/tests/wasm.rs +++ b/tests/wasm.rs @@ -1,27 +1,30 @@ -extern crate chrono; -extern crate wasm_bindgen_test; +#[cfg(target_arch = "wasm32")] +mod test { + extern crate chrono; + extern crate wasm_bindgen_test; -use chrono::prelude::*; -use wasm_bindgen_test::*; + use self::chrono::prelude::*; + use self::wasm_bindgen_test::*; -use std::env; + use std::env; -#[wasm_bindgen_test] -fn now() { - let utc: DateTime = Utc::now(); - let local: DateTime = Local::now(); + #[wasm_bindgen_test] + fn now() { + let utc: DateTime = Utc::now(); + let local: DateTime = Local::now(); - // Ensure time fetched is correct - let actual = Utc.datetime_from_str(env!("NOW"), "%s").unwrap(); - assert!(utc - actual < chrono::Duration::minutes(5)); + // Ensure time fetched is correct + let actual = Utc.datetime_from_str(env!("NOW"), "%s").unwrap(); + assert!(utc - actual < chrono::Duration::minutes(5)); - // Ensure offset retrieved when getting local time is correct - let expected_offset = match env!("TZ") { - "ACST-9:30" => FixedOffset::east(19 * 30 * 60), - "Asia/Katmandu" => FixedOffset::east(23 * 15 * 60), // No DST thankfully - "EST4" => FixedOffset::east(-4 * 60 * 60), - "UTC0" => FixedOffset::east(0), - _ => panic!("unexpected TZ"), - }; - assert_eq!(&expected_offset, local.offset()); + // Ensure offset retrieved when getting local time is correct + let expected_offset = match env!("TZ") { + "ACST-9:30" => FixedOffset::east(19 * 30 * 60), + "Asia/Katmandu" => FixedOffset::east(23 * 15 * 60), // No DST thankfully + "EST4" => FixedOffset::east(-4 * 60 * 60), + "UTC0" => FixedOffset::east(0), + _ => panic!("unexpected TZ"), + }; + assert_eq!(&expected_offset, local.offset()); + } }