From 2da77fb8b06c1fe6dff2a4658e798c6278a027dc Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 20 Jul 2018 22:41:55 -0700
Subject: [PATCH] Merge the `cli` and `test-runner` packages

Shouldn't be any need to have them versioned separately!
---
 .cargo/config                                            | 2 +-
 .travis.yml                                              | 2 +-
 Cargo.toml                                               | 1 -
 crates/cli/Cargo.toml                                    | 1 +
 .../main.rs => cli/src/bin/wasm-bindgen-test-runner.rs}  | 0
 crates/test-runner/Cargo.toml                            | 9 ---------
 crates/test-runner/README.md                             | 5 -----
 crates/test/README.md                                    | 4 +++-
 8 files changed, 6 insertions(+), 18 deletions(-)
 rename crates/{test-runner/src/main.rs => cli/src/bin/wasm-bindgen-test-runner.rs} (100%)
 delete mode 100644 crates/test-runner/Cargo.toml
 delete mode 100644 crates/test-runner/README.md

diff --git a/.cargo/config b/.cargo/config
index b0eb57f4..5159ef51 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,4 +1,4 @@
 # TODO: we shouldn't check this in to git, need to figure out how to avoid doing
 # that.
 [target.wasm32-unknown-unknown]
-runner = 'cargo +nightly run --release -p wasm-bindgen-test-runner --'
+runner = 'cargo +nightly run --release -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
diff --git a/.travis.yml b/.travis.yml
index 8e50ad71..5a531b11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ DEPLOY_TO_GITHUB: &DEPLOY_TO_GITHUB
     |
       name="wasm-bindgen-$TRAVIS_TAG-$TARGET"
       mkdir "$name"
-      cp "target/$TARGET/release/{wasm-bindgen,wasm2es6js}" "$name/"
+      cp "target/$TARGET/release/{wasm-bindgen,wasm2es6js,wasm-bindgen-test-runner}" "$name/"
       cp README.md LICENSE-MIT LICENSE-APACHE "$name/"
       tar czvf "$name.tar.gz" "$name"
   deploy:
diff --git a/Cargo.toml b/Cargo.toml
index ec8cf72a..84da7173 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,6 @@ members = [
   "crates/cli",
   "crates/js-sys",
   "crates/test",
-  "crates/test-runner",
   "crates/typescript",
   "crates/web-sys",
   "crates/webidl",
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 40386803..ca20d4a7 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -19,3 +19,4 @@ serde = "1.0"
 serde_derive = "1.0"
 wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.12" }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.12" }
+parity-wasm = "0.31"
diff --git a/crates/test-runner/src/main.rs b/crates/cli/src/bin/wasm-bindgen-test-runner.rs
similarity index 100%
rename from crates/test-runner/src/main.rs
rename to crates/cli/src/bin/wasm-bindgen-test-runner.rs
diff --git a/crates/test-runner/Cargo.toml b/crates/test-runner/Cargo.toml
deleted file mode 100644
index 7e4344cb..00000000
--- a/crates/test-runner/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "wasm-bindgen-test-runner"
-version = "0.2.12"
-authors = ["The wasm-bindgen Developers"]
-
-[dependencies]
-wasm-bindgen-cli-support = { path = '../cli-support', version = '=0.2.12' }
-failure = "0.1"
-parity-wasm = "0.31"
diff --git a/crates/test-runner/README.md b/crates/test-runner/README.md
deleted file mode 100644
index 64f20b4a..00000000
--- a/crates/test-runner/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# wasm-bindgen-test-runner
-
-This is an **experimental** crate for enabling `cargo test --target
-wasm32-unknown-unknown`. For more information see the README fo
-`wasm-bindgen-test`.
diff --git a/crates/test/README.md b/crates/test/README.md
index 0540858c..69699cd1 100644
--- a/crates/test/README.md
+++ b/crates/test/README.md
@@ -14,9 +14,11 @@ ton of documentation just yet, but a taste of how it works is:
 * First, install the test runner.
 
   ```
-  cargo install --path crates/test-runner
+  cargo install --path crates/cli
   ```
 
+  (this comes with the normal `wasm-bindgen` CLI tool
+
 * Next, add this to your `.cargo/config`:
 
   ```toml