From 6654b574266d963f6cc8ac207e322d618228f228 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Wed, 3 Jul 2019 16:08:10 +0200
Subject: [PATCH 1/2] Run tests serially on Windows CI

---
 .travis.yml  |  2 +-
 appveyor.yml |  2 +-
 ci/run.sh    | 22 +++++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f61203c279..6c9c8b78e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,7 +95,7 @@ matrix:
 
     - &windows
       os: windows
-      env: TARGET=x86_64-pc-windows-msvc NO_ADD=1 EXE_EXT=.exe
+      env: RUST_TEST_THREADS=1 TARGET=x86_64-pc-windows-msvc NO_ADD=1 EXE_EXT=.exe
       services: nil
       language: bash
 
diff --git a/appveyor.yml b/appveyor.yml
index a4464fc6b1..4c5f5d3aea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -71,7 +71,7 @@ build: false
 test_script:
   - cargo build --release --target %TARGET% --locked
   - cargo run --release --target %TARGET% --locked -- --dump-testament
-  - cargo test --release --target %TARGET%
+  - RUST_TEST_THREADS=1 cargo test --release --target %TARGET%
 
 notifications:
   - provider: Webhook
diff --git a/ci/run.sh b/ci/run.sh
index 589984e2e6..2ada858e95 100644
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 set -ex
 
@@ -21,8 +21,20 @@ cargo build --locked -v --release --target "$TARGET" $FEATURES
 if [ -z "$SKIP_TESTS" ]; then
   # shellcheck disable=SC2086
   cargo run --locked --release --target "$TARGET" $FEATURES -- --dump-testament
-  # shellcheck disable=SC2086
-  cargo test --release -p download --target "$TARGET" $FEATURES
-  # shellcheck disable=SC2086
-  cargo test --release --target "$TARGET" $FEATURES
+
+  case $TARGET in
+      *windows*)
+          export RUST_TEST_THREADS=1
+          # shellcheck disable=SC2086
+          cargo test --release -p download --target "$TARGET" $FEATURES
+          # shellcheck disable=SC2086
+          cargo test --release --target "$TARGET" $FEATURES
+      ;;
+      *)
+          # shellcheck disable=SC2086
+          cargo test --release -p download --target "$TARGET" $FEATURES
+          # shellcheck disable=SC2086
+          cargo test --release --target "$TARGET" $FEATURES
+      ;;
+  esac
 fi

From ead42ed2b35dfc9d98e8f30673ef51375d497045 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Wed, 3 Jul 2019 17:26:12 +0200
Subject: [PATCH 2/2] Fix typo

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4c5f5d3aea..66bbd868e0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -71,7 +71,8 @@ build: false
 test_script:
   - cargo build --release --target %TARGET% --locked
   - cargo run --release --target %TARGET% --locked -- --dump-testament
-  - RUST_TEST_THREADS=1 cargo test --release --target %TARGET%
+  - set RUST_TEST_THREADS=1
+  - cargo test --release --target %TARGET%
 
 notifications:
   - provider: Webhook