Clean up test directory structure

6 files changed, 26 insertions, 24 deletions

diff --git a/docs/running.html b/docs/running.html
index 98e6ce01..fc91a006 100644
--- a/docs/running.html
+++ b/docs/running.html
@@ -5,7 +5,7 @@
 </head>
 <div class="nav">(<a href="https://github.com/mlochbaum/BQN">github</a>) / <a href="index.html">BQN</a></div>
 <h1 id="how-to-run-bqn"><a class="header" href="#how-to-run-bqn">How to run BQN</a></h1>
-<p><a href="https://github.com/dzaima/CBQN">CBQN</a> is now the primary offline implementation. However, dzaima/BQN still works, and is used for some testing. Scripts in this repository use <code><span class='Value'>bqn</span></code> in the <code><span class='Comment'>#!</span></code> line if any BQN can run them, and <code><span class='Value'>dbqn</span></code> if only dzaima/BQN works.</p>
+<p><a href="https://github.com/dzaima/CBQN">CBQN</a> is now the primary offline implementation, and can be used everywhere in this repository, except test/dzaima which is specifically for testing with dzaima/BQN. Scripts start with <code><span class='Comment'>#! /usr/bin/env bqn</span></code> in order to look up the user's <code><span class='Value'>bqn</span></code> executable.</p>
 <p>For Nix users, nixpkgs now has repositories for several implementations; <code><span class='Value'>cbqn</span></code> is recommended for general use.</p>
 <h3 id="self-hosted-bqn"><a class="header" href="#self-hosted-bqn">Self-hosted BQN</a></h3>
 <p>See the subsections below for instructions on specific implementations.</p>
diff --git a/running.md b/running.md
index 51b6f1a0..9582ce53 100644
--- a/running.md
+++ b/running.md
@@ -2,7 +2,7 @@
 
 # How to run BQN
 
-[CBQN](https://github.com/dzaima/CBQN) is now the primary offline implementation. However, dzaima/BQN still works, and is used for some testing. Scripts in this repository use `bqn` in the `#!` line if any BQN can run them, and `dbqn` if only dzaima/BQN works.
+[CBQN](https://github.com/dzaima/CBQN) is now the primary offline implementation, and can be used everywhere in this repository, except test/dzaima which is specifically for testing with dzaima/BQN. Scripts start with `#! /usr/bin/env bqn` in order to look up the user's `bqn` executable.
 
 For Nix users, nixpkgs now has repositories for several implementations; `cbqn` is recommended for general use.
 
diff --git a/test/README.txt b/test/README.txt
index f11502b9..97a9d6da 100644
--- a/test/README.txt
+++ b/test/README.txt
@@ -1,26 +1,30 @@
-Test scripts:
+Does your BQN work? Run
 
-  Script            Compiler host   Output host/VM
-- this.bqn          Any             Same
-- unit.bqn          Any             Same + repo
-- js                Self-host       Javascript
-- dz_comp           dzaima/BQN      dzaima/BQN + repo
-- dz_wasm.js        dzaima/BQN      WebAssembly
+$ bqn test/this.bqn
+
+to see. There are additional tests here used for development:
+
+  Script        Compiler host     Output host/VM
+- this.bqn      bqn               Self
+- js            docs/bqn.js       Self
+- unit.bqn      bqn               Self + repo
+- dzaima        dzaima/BQN        Self + repo
+- wasm.js       bqn               WebAssembly
 
 this.bqn can be run in any implementation that supports the necessary
-system functions (•file.List, •file.Lines, •args, •Out, •BQN, •Repr). It
-runs all tests by default, and can be run on a subset by passing their
-names as arguments.
+system functions (•file.List, •file.Lines, •args, •Out, •BQN, •Repr).
 
-dz_comp uses the self-hosted compiler ../src/c.bqn by default but not
-the runtime ../src/r*.bqn. Pass -rt to test with the runtime, and -nocomp
-to test dzaima/BQN only (this doesn't pass as of the time of writing).
+unit.bqn and dz_comp use the self-hosted compiler ../src/c.bqn by
+default but not the runtime ../src/r*.bqn. Pass -rt to test with the
+runtime, and -nocomp to test dzaima/BQN only (this doesn't pass as of
+the time of writing).
 
-Test cases (cases/):
-                  js    dz_comp   dz_wasm.js
-- simple.bqn       *       *          *
-- syntax.bqn       *       *
-- prim.bqn                 *
+Every script but wasm.js can be run on a specified set of tests by
+passing the test names as arguments. this.bqn and unit.bqn run on all
+tests by default; other scripts use the following default tests:
 
-js or dz_comp can be run on a specified set of tests by passing the test
-names as arguments.
+Test cases (cases/):
+                  js    dzaima   wasm.js
+- simple.bqn      *       *        *
+- syntax.bqn      *       *
+- prim.bqn                *
diff --git a/test/dc.bqn b/test/dc.bqn
index 5a0ccae8..0607dc99 100755..100644
--- a/test/dc.bqn
+++ b/test/dc.bqn
@@ -1,5 +1,3 @@
-#! /usr/bin/env dbqn
-
 # dzaima/BQN block headers have a different format to account for
 # multiple bodies, and use variable names instead of counts.
 # Rearrange and make up some names so the bytecode can be run.
diff --git a/test/dz_comp b/test/dzaima
index e9bf1c06..e9bf1c06 100755
--- a/test/dz_comp
+++ b/test/dzaima
diff --git a/test/dz_wasm.js b/test/wasm.js
index b1afa586..b1afa586 100755
--- a/test/dz_wasm.js
+++ b/test/wasm.js