From 0d29397f07cb064e25b04ce9fe77b6a3fad40ada Mon Sep 17 00:00:00 2001
From: Justin Starry <justin.starry@icloud.com>
Date: Sun, 13 Oct 2019 15:17:09 -0400
Subject: [PATCH] Cleanup run tests CI script (#709)

---
 .travis.yml          |  1 +
 ci/check_examples.sh | 10 +++++++
 ci/run_tests.sh      | 63 +++-----------------------------------------
 3 files changed, 15 insertions(+), 59 deletions(-)
 create mode 100755 ci/check_examples.sh

diff --git a/.travis.yml b/.travis.yml
index 9a45394d3ce..ee79b8f81c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,3 +40,4 @@ install:
 script:
   - ./ci/run_checks.sh
   - CHROMEDRIVER=$(pwd)/chromedriver ./ci/run_tests.sh
+  - CHROMEDRIVER=$(pwd)/chromedriver ./ci/check_examples.sh
diff --git a/ci/check_examples.sh b/ci/check_examples.sh
new file mode 100755
index 00000000000..c6651664821
--- /dev/null
+++ b/ci/check_examples.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+
+# Showcase includes all other examples
+cd examples/showcase
+# TODO Can't build some demos with release, need fix
+cargo web build --target asmjs-unknown-emscripten
+cargo web build --target wasm32-unknown-emscripten
+# TODO showcase doesn't support wasm-bindgen yet
+cargo web build --target wasm32-unknown-unknown
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 705a8334e57..5221d0dd024 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -1,65 +1,10 @@
 #!/usr/bin/env bash
+set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
 
-# Originally this ci script borrowed from https://github.com/koute/stdweb
-# because both use `cargo-web` tool to check the compilation.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-set +e
-echo "$(rustc --version)" | grep -q "nightly"
-if [ "$?" = "0" ]; then
-    export IS_NIGHTLY=1
-else
-    export IS_NIGHTLY=0
-fi
-set -e
-
-echo "Is Rust from nightly: $IS_NIGHTLY"
-
-echo "Testing for asmjs-unknown-emscripten..."
-cargo web test --features web_test --target=asmjs-unknown-emscripten
-
-echo "Testing for wasm32-unknown-emscripten..."
-cargo web test --features web_test --target=wasm32-unknown-emscripten
-
-echo "Testing for wasm32-unknown-unknown..."
-cargo test --features wasm_test --target=wasm32-unknown-unknown
-
-echo "Testing html macro..."
+cargo web test --features web_test --target asmjs-unknown-emscripten
+cargo web test --features web_test --target wasm32-unknown-emscripten
+cargo test --features wasm_test --target wasm32-unknown-unknown
 cargo test --test macro_test
-
-echo "Testing derive props macro..."
 cargo test --test derive_props_test
-
-echo "Testing docs"
 cargo doc_test
-
-echo "Testing macro docs..."
 (cd crates/macro && cargo doc_test)
-
-check_example() {
-    echo "Checking example [$2]"
-    pushd $2 > /dev/null
-    cargo web build --target=$1
-    popd > /dev/null
-
-    # TODO Can't build some demos with release, need fix
-    # cargo web build --release $CARGO_WEB_ARGS
-}
-
-check_all_examples() {
-    echo "Checking examples on $1..."
-    for EXAMPLE in $(pwd)/examples/showcase/sub/*; do
-        if [ -d "$EXAMPLE" ]; then
-            check_example $1 $EXAMPLE
-        fi
-    done
-}
-
-# Check showcase only to speed up a building with CI
-# Showcase includes all other examples
-SHOWCASE=$(pwd)/examples/showcase
-check_example asmjs-unknown-emscripten $SHOWCASE
-check_example wasm32-unknown-emscripten $SHOWCASE
-check_example wasm32-unknown-unknown $SHOWCASE