From 421bf2dd52f9ccf1a5f7ebc8a7f452ce5e8a6d3d Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 19 Aug 2024 01:43:23 +0000
Subject: [PATCH] move ed/tests files to regress/bin/ed, where they are used

---
 bin/ed/test/Makefile                         |  26 -------------------
 regress/bin/ed/Makefile                      |   4 +--
 {bin/ed/test => regress/bin/ed}/README       |   2 +-
 {bin/ed/test => regress/bin/ed}/TODO         |   2 +-
 {bin/ed/test => regress/bin/ed}/a.d          |   0
 {bin/ed/test => regress/bin/ed}/a.r          |   0
 {bin/ed/test => regress/bin/ed}/a.t          |   0
 {bin/ed/test => regress/bin/ed}/a1.err       |   0
 {bin/ed/test => regress/bin/ed}/a2.err       |   0
 {bin/ed/test => regress/bin/ed}/addr.d       |   0
 {bin/ed/test => regress/bin/ed}/addr.r       |   0
 {bin/ed/test => regress/bin/ed}/addr.t       |   0
 {bin/ed/test => regress/bin/ed}/addr1.err    |   0
 {bin/ed/test => regress/bin/ed}/addr2.err    |   0
 {bin/ed/test => regress/bin/ed}/ascii.d      | Bin
 {bin/ed/test => regress/bin/ed}/ascii.r      | Bin
 {bin/ed/test => regress/bin/ed}/ascii.t      |   0
 {bin/ed/test => regress/bin/ed}/bang1.d      |   0
 {bin/ed/test => regress/bin/ed}/bang1.err    |   0
 {bin/ed/test => regress/bin/ed}/bang1.r      |   0
 {bin/ed/test => regress/bin/ed}/bang1.t      |   0
 {bin/ed/test => regress/bin/ed}/bang2.err    |   0
 {bin/ed/test => regress/bin/ed}/c.d          |   0
 {bin/ed/test => regress/bin/ed}/c.r          |   0
 {bin/ed/test => regress/bin/ed}/c.t          |   0
 {bin/ed/test => regress/bin/ed}/c1.err       |   0
 {bin/ed/test => regress/bin/ed}/c2.err       |   0
 {bin/ed/test => regress/bin/ed}/ckscripts.sh |   2 +-
 {bin/ed/test => regress/bin/ed}/d.d          |   0
 {bin/ed/test => regress/bin/ed}/d.err        |   0
 {bin/ed/test => regress/bin/ed}/d.r          |   0
 {bin/ed/test => regress/bin/ed}/d.t          |   0
 {bin/ed/test => regress/bin/ed}/d0.d         |   0
 {bin/ed/test => regress/bin/ed}/d0.r         |   0
 {bin/ed/test => regress/bin/ed}/d0.t         |   0
 {bin/ed/test => regress/bin/ed}/d1.d         |   0
 {bin/ed/test => regress/bin/ed}/d1.r         |   0
 {bin/ed/test => regress/bin/ed}/d1.t         |   0
 {bin/ed/test => regress/bin/ed}/d2.d         |   0
 {bin/ed/test => regress/bin/ed}/d2.r         |   0
 {bin/ed/test => regress/bin/ed}/d2.t         |   0
 {bin/ed/test => regress/bin/ed}/d3.d         |   0
 {bin/ed/test => regress/bin/ed}/d3.r         |   0
 {bin/ed/test => regress/bin/ed}/d3.t         |   0
 {bin/ed/test => regress/bin/ed}/d4.d         |   0
 {bin/ed/test => regress/bin/ed}/d4.r         |   0
 {bin/ed/test => regress/bin/ed}/d4.t         |   0
 {bin/ed/test => regress/bin/ed}/d5.d         |   0
 {bin/ed/test => regress/bin/ed}/d5.r         |   0
 {bin/ed/test => regress/bin/ed}/d5.t         |   0
 {bin/ed/test => regress/bin/ed}/e1.d         |   0
 {bin/ed/test => regress/bin/ed}/e1.err       |   0
 {bin/ed/test => regress/bin/ed}/e1.r         |   0
 {bin/ed/test => regress/bin/ed}/e1.t         |   0
 {bin/ed/test => regress/bin/ed}/e2.d         |   0
 {bin/ed/test => regress/bin/ed}/e2.err       |   0
 {bin/ed/test => regress/bin/ed}/e2.r         |   0
 {bin/ed/test => regress/bin/ed}/e2.t         |   0
 {bin/ed/test => regress/bin/ed}/e3.d         |   0
 {bin/ed/test => regress/bin/ed}/e3.err       |   0
 {bin/ed/test => regress/bin/ed}/e3.r         |   0
 {bin/ed/test => regress/bin/ed}/e3.t         |   0
 {bin/ed/test => regress/bin/ed}/e4.d         |   0
 {bin/ed/test => regress/bin/ed}/e4.r         |   0
 {bin/ed/test => regress/bin/ed}/e4.t         |   0
 {bin/ed/test => regress/bin/ed}/eq.err       |   0
 {bin/ed/test => regress/bin/ed}/f1.err       |   0
 {bin/ed/test => regress/bin/ed}/f2.err       |   0
 {bin/ed/test => regress/bin/ed}/g1.d         |   0
 {bin/ed/test => regress/bin/ed}/g1.err       |   0
 {bin/ed/test => regress/bin/ed}/g1.r         |   0
 {bin/ed/test => regress/bin/ed}/g1.t         |   0
 {bin/ed/test => regress/bin/ed}/g2.d         |   0
 {bin/ed/test => regress/bin/ed}/g2.err       |   0
 {bin/ed/test => regress/bin/ed}/g2.r         |   0
 {bin/ed/test => regress/bin/ed}/g2.t         |   0
 {bin/ed/test => regress/bin/ed}/g3.d         |   0
 {bin/ed/test => regress/bin/ed}/g3.err       |   0
 {bin/ed/test => regress/bin/ed}/g3.r         |   0
 {bin/ed/test => regress/bin/ed}/g3.t         |   0
 {bin/ed/test => regress/bin/ed}/g4.d         |   0
 {bin/ed/test => regress/bin/ed}/g4.r         |   0
 {bin/ed/test => regress/bin/ed}/g4.t         |   0
 {bin/ed/test => regress/bin/ed}/g5.d         |   0
 {bin/ed/test => regress/bin/ed}/g5.r         |   0
 {bin/ed/test => regress/bin/ed}/g5.t         |   0
 {bin/ed/test => regress/bin/ed}/h.err        |   0
 {bin/ed/test => regress/bin/ed}/i.d          |   0
 {bin/ed/test => regress/bin/ed}/i.r          |   0
 {bin/ed/test => regress/bin/ed}/i.t          |   0
 {bin/ed/test => regress/bin/ed}/i0.d         |   0
 {bin/ed/test => regress/bin/ed}/i0.r         |   0
 {bin/ed/test => regress/bin/ed}/i0.t         |   0
 {bin/ed/test => regress/bin/ed}/i1.err       |   0
 {bin/ed/test => regress/bin/ed}/i2.err       |   0
 {bin/ed/test => regress/bin/ed}/j.d          |   0
 {bin/ed/test => regress/bin/ed}/j.r          |   0
 {bin/ed/test => regress/bin/ed}/j.t          |   0
 {bin/ed/test => regress/bin/ed}/k.d          |   0
 {bin/ed/test => regress/bin/ed}/k.r          |   0
 {bin/ed/test => regress/bin/ed}/k.t          |   0
 {bin/ed/test => regress/bin/ed}/k1.err       |   0
 {bin/ed/test => regress/bin/ed}/k2.err       |   0
 {bin/ed/test => regress/bin/ed}/k3.err       |   0
 {bin/ed/test => regress/bin/ed}/k4.err       |   0
 {bin/ed/test => regress/bin/ed}/l.d          |   0
 {bin/ed/test => regress/bin/ed}/l.r          |   0
 {bin/ed/test => regress/bin/ed}/l.t          |   0
 {bin/ed/test => regress/bin/ed}/m.d          |   0
 {bin/ed/test => regress/bin/ed}/m.err        |   0
 {bin/ed/test => regress/bin/ed}/m.r          |   0
 {bin/ed/test => regress/bin/ed}/m.t          |   0
 {bin/ed/test => regress/bin/ed}/mkscripts.sh |   2 +-
 {bin/ed/test => regress/bin/ed}/n.d          |   0
 {bin/ed/test => regress/bin/ed}/n.r          |   0
 {bin/ed/test => regress/bin/ed}/n.t          |   0
 {bin/ed/test => regress/bin/ed}/nl1.d        |   0
 {bin/ed/test => regress/bin/ed}/nl1.r        |   0
 {bin/ed/test => regress/bin/ed}/nl1.t        |   0
 {bin/ed/test => regress/bin/ed}/nl2.d        |   0
 {bin/ed/test => regress/bin/ed}/nl2.r        |   0
 {bin/ed/test => regress/bin/ed}/nl2.t        |   0
 {bin/ed/test => regress/bin/ed}/p.d          |   0
 {bin/ed/test => regress/bin/ed}/p.r          |   0
 {bin/ed/test => regress/bin/ed}/p.t          |   0
 {bin/ed/test => regress/bin/ed}/q.d          |   0
 {bin/ed/test => regress/bin/ed}/q.r          |   0
 {bin/ed/test => regress/bin/ed}/q.t          |   0
 {bin/ed/test => regress/bin/ed}/q1.err       |   0
 {bin/ed/test => regress/bin/ed}/r1.d         |   0
 {bin/ed/test => regress/bin/ed}/r1.err       |   0
 {bin/ed/test => regress/bin/ed}/r1.r         |   0
 {bin/ed/test => regress/bin/ed}/r1.t         |   0
 {bin/ed/test => regress/bin/ed}/r2.d         |   0
 {bin/ed/test => regress/bin/ed}/r2.err       |   0
 {bin/ed/test => regress/bin/ed}/r2.r         |   0
 {bin/ed/test => regress/bin/ed}/r2.t         |   0
 {bin/ed/test => regress/bin/ed}/r3.d         |   0
 {bin/ed/test => regress/bin/ed}/r3.r         |   0
 {bin/ed/test => regress/bin/ed}/r3.t         |   0
 {bin/ed/test => regress/bin/ed}/s1.d         |   0
 {bin/ed/test => regress/bin/ed}/s1.err       |   0
 {bin/ed/test => regress/bin/ed}/s1.r         |   0
 {bin/ed/test => regress/bin/ed}/s1.t         |   0
 {bin/ed/test => regress/bin/ed}/s10.err      |   0
 {bin/ed/test => regress/bin/ed}/s2.d         |   0
 {bin/ed/test => regress/bin/ed}/s2.r         |   0
 {bin/ed/test => regress/bin/ed}/s2.t         |   0
 {bin/ed/test => regress/bin/ed}/s3.d         |   0
 {bin/ed/test => regress/bin/ed}/s3.err       |   0
 {bin/ed/test => regress/bin/ed}/s3.r         |   0
 {bin/ed/test => regress/bin/ed}/s3.t         |   0
 {bin/ed/test => regress/bin/ed}/s4.d         |   0
 {bin/ed/test => regress/bin/ed}/s4.err       |   0
 {bin/ed/test => regress/bin/ed}/s4.r         |   0
 {bin/ed/test => regress/bin/ed}/s4.t         |   0
 {bin/ed/test => regress/bin/ed}/s5.err       |   0
 {bin/ed/test => regress/bin/ed}/s6.err       |   0
 {bin/ed/test => regress/bin/ed}/s7.err       |   0
 {bin/ed/test => regress/bin/ed}/s8.err       |   0
 {bin/ed/test => regress/bin/ed}/s9.err       |   0
 {bin/ed/test => regress/bin/ed}/t.d          |   0
 {bin/ed/test => regress/bin/ed}/t.r          |   0
 {bin/ed/test => regress/bin/ed}/t.t          |   0
 {bin/ed/test => regress/bin/ed}/t1.d         |   0
 {bin/ed/test => regress/bin/ed}/t1.err       |   0
 {bin/ed/test => regress/bin/ed}/t1.r         |   0
 {bin/ed/test => regress/bin/ed}/t1.t         |   0
 {bin/ed/test => regress/bin/ed}/t2.d         |   0
 {bin/ed/test => regress/bin/ed}/t2.err       |   0
 {bin/ed/test => regress/bin/ed}/t2.r         |   0
 {bin/ed/test => regress/bin/ed}/t2.t         |   0
 {bin/ed/test => regress/bin/ed}/u.d          |   0
 {bin/ed/test => regress/bin/ed}/u.err        |   0
 {bin/ed/test => regress/bin/ed}/u.r          |   0
 {bin/ed/test => regress/bin/ed}/u.t          |   0
 {bin/ed/test => regress/bin/ed}/v.d          |   0
 {bin/ed/test => regress/bin/ed}/v.r          |   0
 {bin/ed/test => regress/bin/ed}/v.t          |   0
 {bin/ed/test => regress/bin/ed}/w.d          |   0
 {bin/ed/test => regress/bin/ed}/w.r          |   0
 {bin/ed/test => regress/bin/ed}/w.t          |   0
 {bin/ed/test => regress/bin/ed}/w1.err       |   0
 {bin/ed/test => regress/bin/ed}/w2.err       |   0
 {bin/ed/test => regress/bin/ed}/w3.err       |   0
 {bin/ed/test => regress/bin/ed}/x.err        |   0
 {bin/ed/test => regress/bin/ed}/z.err        |   0
 187 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 bin/ed/test/Makefile
 rename {bin/ed/test => regress/bin/ed}/README (95%)
 rename {bin/ed/test => regress/bin/ed}/TODO (90%)
 rename {bin/ed/test => regress/bin/ed}/a.d (100%)
 rename {bin/ed/test => regress/bin/ed}/a.r (100%)
 rename {bin/ed/test => regress/bin/ed}/a.t (100%)
 rename {bin/ed/test => regress/bin/ed}/a1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/a2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/addr.d (100%)
 rename {bin/ed/test => regress/bin/ed}/addr.r (100%)
 rename {bin/ed/test => regress/bin/ed}/addr.t (100%)
 rename {bin/ed/test => regress/bin/ed}/addr1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/addr2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/ascii.d (100%)
 rename {bin/ed/test => regress/bin/ed}/ascii.r (100%)
 rename {bin/ed/test => regress/bin/ed}/ascii.t (100%)
 rename {bin/ed/test => regress/bin/ed}/bang1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/bang1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/bang1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/bang1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/bang2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/c.d (100%)
 rename {bin/ed/test => regress/bin/ed}/c.r (100%)
 rename {bin/ed/test => regress/bin/ed}/c.t (100%)
 rename {bin/ed/test => regress/bin/ed}/c1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/c2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/ckscripts.sh (93%)
 rename {bin/ed/test => regress/bin/ed}/d.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d.err (100%)
 rename {bin/ed/test => regress/bin/ed}/d.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d0.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d0.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d0.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d3.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d3.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d3.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d4.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d4.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d4.t (100%)
 rename {bin/ed/test => regress/bin/ed}/d5.d (100%)
 rename {bin/ed/test => regress/bin/ed}/d5.r (100%)
 rename {bin/ed/test => regress/bin/ed}/d5.t (100%)
 rename {bin/ed/test => regress/bin/ed}/e1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/e1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/e1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/e1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/e2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/e2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/e2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/e2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/e3.d (100%)
 rename {bin/ed/test => regress/bin/ed}/e3.err (100%)
 rename {bin/ed/test => regress/bin/ed}/e3.r (100%)
 rename {bin/ed/test => regress/bin/ed}/e3.t (100%)
 rename {bin/ed/test => regress/bin/ed}/e4.d (100%)
 rename {bin/ed/test => regress/bin/ed}/e4.r (100%)
 rename {bin/ed/test => regress/bin/ed}/e4.t (100%)
 rename {bin/ed/test => regress/bin/ed}/eq.err (100%)
 rename {bin/ed/test => regress/bin/ed}/f1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/f2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/g1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/g1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/g1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/g1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/g2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/g2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/g2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/g2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/g3.d (100%)
 rename {bin/ed/test => regress/bin/ed}/g3.err (100%)
 rename {bin/ed/test => regress/bin/ed}/g3.r (100%)
 rename {bin/ed/test => regress/bin/ed}/g3.t (100%)
 rename {bin/ed/test => regress/bin/ed}/g4.d (100%)
 rename {bin/ed/test => regress/bin/ed}/g4.r (100%)
 rename {bin/ed/test => regress/bin/ed}/g4.t (100%)
 rename {bin/ed/test => regress/bin/ed}/g5.d (100%)
 rename {bin/ed/test => regress/bin/ed}/g5.r (100%)
 rename {bin/ed/test => regress/bin/ed}/g5.t (100%)
 rename {bin/ed/test => regress/bin/ed}/h.err (100%)
 rename {bin/ed/test => regress/bin/ed}/i.d (100%)
 rename {bin/ed/test => regress/bin/ed}/i.r (100%)
 rename {bin/ed/test => regress/bin/ed}/i.t (100%)
 rename {bin/ed/test => regress/bin/ed}/i0.d (100%)
 rename {bin/ed/test => regress/bin/ed}/i0.r (100%)
 rename {bin/ed/test => regress/bin/ed}/i0.t (100%)
 rename {bin/ed/test => regress/bin/ed}/i1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/i2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/j.d (100%)
 rename {bin/ed/test => regress/bin/ed}/j.r (100%)
 rename {bin/ed/test => regress/bin/ed}/j.t (100%)
 rename {bin/ed/test => regress/bin/ed}/k.d (100%)
 rename {bin/ed/test => regress/bin/ed}/k.r (100%)
 rename {bin/ed/test => regress/bin/ed}/k.t (100%)
 rename {bin/ed/test => regress/bin/ed}/k1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/k2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/k3.err (100%)
 rename {bin/ed/test => regress/bin/ed}/k4.err (100%)
 rename {bin/ed/test => regress/bin/ed}/l.d (100%)
 rename {bin/ed/test => regress/bin/ed}/l.r (100%)
 rename {bin/ed/test => regress/bin/ed}/l.t (100%)
 rename {bin/ed/test => regress/bin/ed}/m.d (100%)
 rename {bin/ed/test => regress/bin/ed}/m.err (100%)
 rename {bin/ed/test => regress/bin/ed}/m.r (100%)
 rename {bin/ed/test => regress/bin/ed}/m.t (100%)
 rename {bin/ed/test => regress/bin/ed}/mkscripts.sh (95%)
 rename {bin/ed/test => regress/bin/ed}/n.d (100%)
 rename {bin/ed/test => regress/bin/ed}/n.r (100%)
 rename {bin/ed/test => regress/bin/ed}/n.t (100%)
 rename {bin/ed/test => regress/bin/ed}/nl1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/nl1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/nl1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/nl2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/nl2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/nl2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/p.d (100%)
 rename {bin/ed/test => regress/bin/ed}/p.r (100%)
 rename {bin/ed/test => regress/bin/ed}/p.t (100%)
 rename {bin/ed/test => regress/bin/ed}/q.d (100%)
 rename {bin/ed/test => regress/bin/ed}/q.r (100%)
 rename {bin/ed/test => regress/bin/ed}/q.t (100%)
 rename {bin/ed/test => regress/bin/ed}/q1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/r1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/r1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/r1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/r1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/r2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/r2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/r2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/r2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/r3.d (100%)
 rename {bin/ed/test => regress/bin/ed}/r3.r (100%)
 rename {bin/ed/test => regress/bin/ed}/r3.t (100%)
 rename {bin/ed/test => regress/bin/ed}/s1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/s1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/s1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/s10.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/s2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/s2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/s3.d (100%)
 rename {bin/ed/test => regress/bin/ed}/s3.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s3.r (100%)
 rename {bin/ed/test => regress/bin/ed}/s3.t (100%)
 rename {bin/ed/test => regress/bin/ed}/s4.d (100%)
 rename {bin/ed/test => regress/bin/ed}/s4.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s4.r (100%)
 rename {bin/ed/test => regress/bin/ed}/s4.t (100%)
 rename {bin/ed/test => regress/bin/ed}/s5.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s6.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s7.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s8.err (100%)
 rename {bin/ed/test => regress/bin/ed}/s9.err (100%)
 rename {bin/ed/test => regress/bin/ed}/t.d (100%)
 rename {bin/ed/test => regress/bin/ed}/t.r (100%)
 rename {bin/ed/test => regress/bin/ed}/t.t (100%)
 rename {bin/ed/test => regress/bin/ed}/t1.d (100%)
 rename {bin/ed/test => regress/bin/ed}/t1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/t1.r (100%)
 rename {bin/ed/test => regress/bin/ed}/t1.t (100%)
 rename {bin/ed/test => regress/bin/ed}/t2.d (100%)
 rename {bin/ed/test => regress/bin/ed}/t2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/t2.r (100%)
 rename {bin/ed/test => regress/bin/ed}/t2.t (100%)
 rename {bin/ed/test => regress/bin/ed}/u.d (100%)
 rename {bin/ed/test => regress/bin/ed}/u.err (100%)
 rename {bin/ed/test => regress/bin/ed}/u.r (100%)
 rename {bin/ed/test => regress/bin/ed}/u.t (100%)
 rename {bin/ed/test => regress/bin/ed}/v.d (100%)
 rename {bin/ed/test => regress/bin/ed}/v.r (100%)
 rename {bin/ed/test => regress/bin/ed}/v.t (100%)
 rename {bin/ed/test => regress/bin/ed}/w.d (100%)
 rename {bin/ed/test => regress/bin/ed}/w.r (100%)
 rename {bin/ed/test => regress/bin/ed}/w.t (100%)
 rename {bin/ed/test => regress/bin/ed}/w1.err (100%)
 rename {bin/ed/test => regress/bin/ed}/w2.err (100%)
 rename {bin/ed/test => regress/bin/ed}/w3.err (100%)
 rename {bin/ed/test => regress/bin/ed}/x.err (100%)
 rename {bin/ed/test => regress/bin/ed}/z.err (100%)

diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
deleted file mode 100644
index de3e737f7fb..00000000000
--- a/bin/ed/test/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/23 14:20:05 deraadt Exp $
-#	$NetBSD: Makefile,v 1.11 1995/03/21 09:05:14 cgd Exp $
-
-SHELL=	/bin/sh
-ED=	../obj/ed
-
-all: check
-	@:
-
-check: build test
-	@if grep -h '\*\*\*' errs.o scripts.o; then :; else \
-		echo "tests completed successfully."; \
-	fi
-
-build: mkscripts.sh
-	@if [ -f errs.o ]; then :; else \
-		echo "building test scripts for $(ED) ..."; \
-		$(SHELL) mkscripts.sh $(ED); \
-	fi
-
-test: build ckscripts.sh
-	@echo testing $(ED) ...
-	@$(SHELL) ckscripts.sh $(ED)
-
-clean:
-	rm -f *.ed *.red *.[oz] *~
diff --git a/regress/bin/ed/Makefile b/regress/bin/ed/Makefile
index a4654d502da..b4c0230f1e5 100644
--- a/regress/bin/ed/Makefile
+++ b/regress/bin/ed/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2024/08/19 01:43:23 deraadt Exp $
 
 ED ?=		/bin/ed
-TESTDIR =	${.CURDIR}/../../../bin/ed/test
+TESTDIR =	${.CURDIR}
 
 TS !=		cd ${TESTDIR} && ls *.t
 ERRS !=		cd ${TESTDIR} && ls *.err
diff --git a/bin/ed/test/README b/regress/bin/ed/README
similarity index 95%
rename from bin/ed/test/README
rename to regress/bin/ed/README
index 27ad28dd9f5..aba7599c53e 100644
--- a/bin/ed/test/README
+++ b/regress/bin/ed/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.3 2018/01/09 00:43:10 bluhm Exp $
+$OpenBSD: README,v 1.1 2024/08/19 01:43:23 deraadt Exp $
 $NetBSD: README,v 1.8 1995/03/21 09:05:18 cgd Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
diff --git a/bin/ed/test/TODO b/regress/bin/ed/TODO
similarity index 90%
rename from bin/ed/test/TODO
rename to regress/bin/ed/TODO
index a119709bf7a..cb566f64155 100644
--- a/bin/ed/test/TODO
+++ b/regress/bin/ed/TODO
@@ -1,4 +1,4 @@
-$OpenBSD: TODO,v 1.2 1996/06/23 14:20:06 deraadt Exp $
+$OpenBSD: TODO,v 1.1 2024/08/19 01:43:23 deraadt Exp $
 $NetBSD: TODO,v 1.3 1995/03/21 09:05:20 cgd Exp $
 
 Some missing tests:
diff --git a/bin/ed/test/a.d b/regress/bin/ed/a.d
similarity index 100%
rename from bin/ed/test/a.d
rename to regress/bin/ed/a.d
diff --git a/bin/ed/test/a.r b/regress/bin/ed/a.r
similarity index 100%
rename from bin/ed/test/a.r
rename to regress/bin/ed/a.r
diff --git a/bin/ed/test/a.t b/regress/bin/ed/a.t
similarity index 100%
rename from bin/ed/test/a.t
rename to regress/bin/ed/a.t
diff --git a/bin/ed/test/a1.err b/regress/bin/ed/a1.err
similarity index 100%
rename from bin/ed/test/a1.err
rename to regress/bin/ed/a1.err
diff --git a/bin/ed/test/a2.err b/regress/bin/ed/a2.err
similarity index 100%
rename from bin/ed/test/a2.err
rename to regress/bin/ed/a2.err
diff --git a/bin/ed/test/addr.d b/regress/bin/ed/addr.d
similarity index 100%
rename from bin/ed/test/addr.d
rename to regress/bin/ed/addr.d
diff --git a/bin/ed/test/addr.r b/regress/bin/ed/addr.r
similarity index 100%
rename from bin/ed/test/addr.r
rename to regress/bin/ed/addr.r
diff --git a/bin/ed/test/addr.t b/regress/bin/ed/addr.t
similarity index 100%
rename from bin/ed/test/addr.t
rename to regress/bin/ed/addr.t
diff --git a/bin/ed/test/addr1.err b/regress/bin/ed/addr1.err
similarity index 100%
rename from bin/ed/test/addr1.err
rename to regress/bin/ed/addr1.err
diff --git a/bin/ed/test/addr2.err b/regress/bin/ed/addr2.err
similarity index 100%
rename from bin/ed/test/addr2.err
rename to regress/bin/ed/addr2.err
diff --git a/bin/ed/test/ascii.d b/regress/bin/ed/ascii.d
similarity index 100%
rename from bin/ed/test/ascii.d
rename to regress/bin/ed/ascii.d
diff --git a/bin/ed/test/ascii.r b/regress/bin/ed/ascii.r
similarity index 100%
rename from bin/ed/test/ascii.r
rename to regress/bin/ed/ascii.r
diff --git a/bin/ed/test/ascii.t b/regress/bin/ed/ascii.t
similarity index 100%
rename from bin/ed/test/ascii.t
rename to regress/bin/ed/ascii.t
diff --git a/bin/ed/test/bang1.d b/regress/bin/ed/bang1.d
similarity index 100%
rename from bin/ed/test/bang1.d
rename to regress/bin/ed/bang1.d
diff --git a/bin/ed/test/bang1.err b/regress/bin/ed/bang1.err
similarity index 100%
rename from bin/ed/test/bang1.err
rename to regress/bin/ed/bang1.err
diff --git a/bin/ed/test/bang1.r b/regress/bin/ed/bang1.r
similarity index 100%
rename from bin/ed/test/bang1.r
rename to regress/bin/ed/bang1.r
diff --git a/bin/ed/test/bang1.t b/regress/bin/ed/bang1.t
similarity index 100%
rename from bin/ed/test/bang1.t
rename to regress/bin/ed/bang1.t
diff --git a/bin/ed/test/bang2.err b/regress/bin/ed/bang2.err
similarity index 100%
rename from bin/ed/test/bang2.err
rename to regress/bin/ed/bang2.err
diff --git a/bin/ed/test/c.d b/regress/bin/ed/c.d
similarity index 100%
rename from bin/ed/test/c.d
rename to regress/bin/ed/c.d
diff --git a/bin/ed/test/c.r b/regress/bin/ed/c.r
similarity index 100%
rename from bin/ed/test/c.r
rename to regress/bin/ed/c.r
diff --git a/bin/ed/test/c.t b/regress/bin/ed/c.t
similarity index 100%
rename from bin/ed/test/c.t
rename to regress/bin/ed/c.t
diff --git a/bin/ed/test/c1.err b/regress/bin/ed/c1.err
similarity index 100%
rename from bin/ed/test/c1.err
rename to regress/bin/ed/c1.err
diff --git a/bin/ed/test/c2.err b/regress/bin/ed/c2.err
similarity index 100%
rename from bin/ed/test/c2.err
rename to regress/bin/ed/c2.err
diff --git a/bin/ed/test/ckscripts.sh b/regress/bin/ed/ckscripts.sh
similarity index 93%
rename from bin/ed/test/ckscripts.sh
rename to regress/bin/ed/ckscripts.sh
index b401a79058e..a8ee9e7b73b 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/regress/bin/ed/ckscripts.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: ckscripts.sh,v 1.3 1998/07/12 03:49:08 todd Exp $
+#	$OpenBSD: ckscripts.sh,v 1.1 2024/08/19 01:43:23 deraadt Exp $
 #	$NetBSD: ckscripts.sh,v 1.9 1995/04/23 10:07:34 cgd Exp $
 #
 # This script runs the .ed scripts generated by mkscripts.sh
diff --git a/bin/ed/test/d.d b/regress/bin/ed/d.d
similarity index 100%
rename from bin/ed/test/d.d
rename to regress/bin/ed/d.d
diff --git a/bin/ed/test/d.err b/regress/bin/ed/d.err
similarity index 100%
rename from bin/ed/test/d.err
rename to regress/bin/ed/d.err
diff --git a/bin/ed/test/d.r b/regress/bin/ed/d.r
similarity index 100%
rename from bin/ed/test/d.r
rename to regress/bin/ed/d.r
diff --git a/bin/ed/test/d.t b/regress/bin/ed/d.t
similarity index 100%
rename from bin/ed/test/d.t
rename to regress/bin/ed/d.t
diff --git a/bin/ed/test/d0.d b/regress/bin/ed/d0.d
similarity index 100%
rename from bin/ed/test/d0.d
rename to regress/bin/ed/d0.d
diff --git a/bin/ed/test/d0.r b/regress/bin/ed/d0.r
similarity index 100%
rename from bin/ed/test/d0.r
rename to regress/bin/ed/d0.r
diff --git a/bin/ed/test/d0.t b/regress/bin/ed/d0.t
similarity index 100%
rename from bin/ed/test/d0.t
rename to regress/bin/ed/d0.t
diff --git a/bin/ed/test/d1.d b/regress/bin/ed/d1.d
similarity index 100%
rename from bin/ed/test/d1.d
rename to regress/bin/ed/d1.d
diff --git a/bin/ed/test/d1.r b/regress/bin/ed/d1.r
similarity index 100%
rename from bin/ed/test/d1.r
rename to regress/bin/ed/d1.r
diff --git a/bin/ed/test/d1.t b/regress/bin/ed/d1.t
similarity index 100%
rename from bin/ed/test/d1.t
rename to regress/bin/ed/d1.t
diff --git a/bin/ed/test/d2.d b/regress/bin/ed/d2.d
similarity index 100%
rename from bin/ed/test/d2.d
rename to regress/bin/ed/d2.d
diff --git a/bin/ed/test/d2.r b/regress/bin/ed/d2.r
similarity index 100%
rename from bin/ed/test/d2.r
rename to regress/bin/ed/d2.r
diff --git a/bin/ed/test/d2.t b/regress/bin/ed/d2.t
similarity index 100%
rename from bin/ed/test/d2.t
rename to regress/bin/ed/d2.t
diff --git a/bin/ed/test/d3.d b/regress/bin/ed/d3.d
similarity index 100%
rename from bin/ed/test/d3.d
rename to regress/bin/ed/d3.d
diff --git a/bin/ed/test/d3.r b/regress/bin/ed/d3.r
similarity index 100%
rename from bin/ed/test/d3.r
rename to regress/bin/ed/d3.r
diff --git a/bin/ed/test/d3.t b/regress/bin/ed/d3.t
similarity index 100%
rename from bin/ed/test/d3.t
rename to regress/bin/ed/d3.t
diff --git a/bin/ed/test/d4.d b/regress/bin/ed/d4.d
similarity index 100%
rename from bin/ed/test/d4.d
rename to regress/bin/ed/d4.d
diff --git a/bin/ed/test/d4.r b/regress/bin/ed/d4.r
similarity index 100%
rename from bin/ed/test/d4.r
rename to regress/bin/ed/d4.r
diff --git a/bin/ed/test/d4.t b/regress/bin/ed/d4.t
similarity index 100%
rename from bin/ed/test/d4.t
rename to regress/bin/ed/d4.t
diff --git a/bin/ed/test/d5.d b/regress/bin/ed/d5.d
similarity index 100%
rename from bin/ed/test/d5.d
rename to regress/bin/ed/d5.d
diff --git a/bin/ed/test/d5.r b/regress/bin/ed/d5.r
similarity index 100%
rename from bin/ed/test/d5.r
rename to regress/bin/ed/d5.r
diff --git a/bin/ed/test/d5.t b/regress/bin/ed/d5.t
similarity index 100%
rename from bin/ed/test/d5.t
rename to regress/bin/ed/d5.t
diff --git a/bin/ed/test/e1.d b/regress/bin/ed/e1.d
similarity index 100%
rename from bin/ed/test/e1.d
rename to regress/bin/ed/e1.d
diff --git a/bin/ed/test/e1.err b/regress/bin/ed/e1.err
similarity index 100%
rename from bin/ed/test/e1.err
rename to regress/bin/ed/e1.err
diff --git a/bin/ed/test/e1.r b/regress/bin/ed/e1.r
similarity index 100%
rename from bin/ed/test/e1.r
rename to regress/bin/ed/e1.r
diff --git a/bin/ed/test/e1.t b/regress/bin/ed/e1.t
similarity index 100%
rename from bin/ed/test/e1.t
rename to regress/bin/ed/e1.t
diff --git a/bin/ed/test/e2.d b/regress/bin/ed/e2.d
similarity index 100%
rename from bin/ed/test/e2.d
rename to regress/bin/ed/e2.d
diff --git a/bin/ed/test/e2.err b/regress/bin/ed/e2.err
similarity index 100%
rename from bin/ed/test/e2.err
rename to regress/bin/ed/e2.err
diff --git a/bin/ed/test/e2.r b/regress/bin/ed/e2.r
similarity index 100%
rename from bin/ed/test/e2.r
rename to regress/bin/ed/e2.r
diff --git a/bin/ed/test/e2.t b/regress/bin/ed/e2.t
similarity index 100%
rename from bin/ed/test/e2.t
rename to regress/bin/ed/e2.t
diff --git a/bin/ed/test/e3.d b/regress/bin/ed/e3.d
similarity index 100%
rename from bin/ed/test/e3.d
rename to regress/bin/ed/e3.d
diff --git a/bin/ed/test/e3.err b/regress/bin/ed/e3.err
similarity index 100%
rename from bin/ed/test/e3.err
rename to regress/bin/ed/e3.err
diff --git a/bin/ed/test/e3.r b/regress/bin/ed/e3.r
similarity index 100%
rename from bin/ed/test/e3.r
rename to regress/bin/ed/e3.r
diff --git a/bin/ed/test/e3.t b/regress/bin/ed/e3.t
similarity index 100%
rename from bin/ed/test/e3.t
rename to regress/bin/ed/e3.t
diff --git a/bin/ed/test/e4.d b/regress/bin/ed/e4.d
similarity index 100%
rename from bin/ed/test/e4.d
rename to regress/bin/ed/e4.d
diff --git a/bin/ed/test/e4.r b/regress/bin/ed/e4.r
similarity index 100%
rename from bin/ed/test/e4.r
rename to regress/bin/ed/e4.r
diff --git a/bin/ed/test/e4.t b/regress/bin/ed/e4.t
similarity index 100%
rename from bin/ed/test/e4.t
rename to regress/bin/ed/e4.t
diff --git a/bin/ed/test/eq.err b/regress/bin/ed/eq.err
similarity index 100%
rename from bin/ed/test/eq.err
rename to regress/bin/ed/eq.err
diff --git a/bin/ed/test/f1.err b/regress/bin/ed/f1.err
similarity index 100%
rename from bin/ed/test/f1.err
rename to regress/bin/ed/f1.err
diff --git a/bin/ed/test/f2.err b/regress/bin/ed/f2.err
similarity index 100%
rename from bin/ed/test/f2.err
rename to regress/bin/ed/f2.err
diff --git a/bin/ed/test/g1.d b/regress/bin/ed/g1.d
similarity index 100%
rename from bin/ed/test/g1.d
rename to regress/bin/ed/g1.d
diff --git a/bin/ed/test/g1.err b/regress/bin/ed/g1.err
similarity index 100%
rename from bin/ed/test/g1.err
rename to regress/bin/ed/g1.err
diff --git a/bin/ed/test/g1.r b/regress/bin/ed/g1.r
similarity index 100%
rename from bin/ed/test/g1.r
rename to regress/bin/ed/g1.r
diff --git a/bin/ed/test/g1.t b/regress/bin/ed/g1.t
similarity index 100%
rename from bin/ed/test/g1.t
rename to regress/bin/ed/g1.t
diff --git a/bin/ed/test/g2.d b/regress/bin/ed/g2.d
similarity index 100%
rename from bin/ed/test/g2.d
rename to regress/bin/ed/g2.d
diff --git a/bin/ed/test/g2.err b/regress/bin/ed/g2.err
similarity index 100%
rename from bin/ed/test/g2.err
rename to regress/bin/ed/g2.err
diff --git a/bin/ed/test/g2.r b/regress/bin/ed/g2.r
similarity index 100%
rename from bin/ed/test/g2.r
rename to regress/bin/ed/g2.r
diff --git a/bin/ed/test/g2.t b/regress/bin/ed/g2.t
similarity index 100%
rename from bin/ed/test/g2.t
rename to regress/bin/ed/g2.t
diff --git a/bin/ed/test/g3.d b/regress/bin/ed/g3.d
similarity index 100%
rename from bin/ed/test/g3.d
rename to regress/bin/ed/g3.d
diff --git a/bin/ed/test/g3.err b/regress/bin/ed/g3.err
similarity index 100%
rename from bin/ed/test/g3.err
rename to regress/bin/ed/g3.err
diff --git a/bin/ed/test/g3.r b/regress/bin/ed/g3.r
similarity index 100%
rename from bin/ed/test/g3.r
rename to regress/bin/ed/g3.r
diff --git a/bin/ed/test/g3.t b/regress/bin/ed/g3.t
similarity index 100%
rename from bin/ed/test/g3.t
rename to regress/bin/ed/g3.t
diff --git a/bin/ed/test/g4.d b/regress/bin/ed/g4.d
similarity index 100%
rename from bin/ed/test/g4.d
rename to regress/bin/ed/g4.d
diff --git a/bin/ed/test/g4.r b/regress/bin/ed/g4.r
similarity index 100%
rename from bin/ed/test/g4.r
rename to regress/bin/ed/g4.r
diff --git a/bin/ed/test/g4.t b/regress/bin/ed/g4.t
similarity index 100%
rename from bin/ed/test/g4.t
rename to regress/bin/ed/g4.t
diff --git a/bin/ed/test/g5.d b/regress/bin/ed/g5.d
similarity index 100%
rename from bin/ed/test/g5.d
rename to regress/bin/ed/g5.d
diff --git a/bin/ed/test/g5.r b/regress/bin/ed/g5.r
similarity index 100%
rename from bin/ed/test/g5.r
rename to regress/bin/ed/g5.r
diff --git a/bin/ed/test/g5.t b/regress/bin/ed/g5.t
similarity index 100%
rename from bin/ed/test/g5.t
rename to regress/bin/ed/g5.t
diff --git a/bin/ed/test/h.err b/regress/bin/ed/h.err
similarity index 100%
rename from bin/ed/test/h.err
rename to regress/bin/ed/h.err
diff --git a/bin/ed/test/i.d b/regress/bin/ed/i.d
similarity index 100%
rename from bin/ed/test/i.d
rename to regress/bin/ed/i.d
diff --git a/bin/ed/test/i.r b/regress/bin/ed/i.r
similarity index 100%
rename from bin/ed/test/i.r
rename to regress/bin/ed/i.r
diff --git a/bin/ed/test/i.t b/regress/bin/ed/i.t
similarity index 100%
rename from bin/ed/test/i.t
rename to regress/bin/ed/i.t
diff --git a/bin/ed/test/i0.d b/regress/bin/ed/i0.d
similarity index 100%
rename from bin/ed/test/i0.d
rename to regress/bin/ed/i0.d
diff --git a/bin/ed/test/i0.r b/regress/bin/ed/i0.r
similarity index 100%
rename from bin/ed/test/i0.r
rename to regress/bin/ed/i0.r
diff --git a/bin/ed/test/i0.t b/regress/bin/ed/i0.t
similarity index 100%
rename from bin/ed/test/i0.t
rename to regress/bin/ed/i0.t
diff --git a/bin/ed/test/i1.err b/regress/bin/ed/i1.err
similarity index 100%
rename from bin/ed/test/i1.err
rename to regress/bin/ed/i1.err
diff --git a/bin/ed/test/i2.err b/regress/bin/ed/i2.err
similarity index 100%
rename from bin/ed/test/i2.err
rename to regress/bin/ed/i2.err
diff --git a/bin/ed/test/j.d b/regress/bin/ed/j.d
similarity index 100%
rename from bin/ed/test/j.d
rename to regress/bin/ed/j.d
diff --git a/bin/ed/test/j.r b/regress/bin/ed/j.r
similarity index 100%
rename from bin/ed/test/j.r
rename to regress/bin/ed/j.r
diff --git a/bin/ed/test/j.t b/regress/bin/ed/j.t
similarity index 100%
rename from bin/ed/test/j.t
rename to regress/bin/ed/j.t
diff --git a/bin/ed/test/k.d b/regress/bin/ed/k.d
similarity index 100%
rename from bin/ed/test/k.d
rename to regress/bin/ed/k.d
diff --git a/bin/ed/test/k.r b/regress/bin/ed/k.r
similarity index 100%
rename from bin/ed/test/k.r
rename to regress/bin/ed/k.r
diff --git a/bin/ed/test/k.t b/regress/bin/ed/k.t
similarity index 100%
rename from bin/ed/test/k.t
rename to regress/bin/ed/k.t
diff --git a/bin/ed/test/k1.err b/regress/bin/ed/k1.err
similarity index 100%
rename from bin/ed/test/k1.err
rename to regress/bin/ed/k1.err
diff --git a/bin/ed/test/k2.err b/regress/bin/ed/k2.err
similarity index 100%
rename from bin/ed/test/k2.err
rename to regress/bin/ed/k2.err
diff --git a/bin/ed/test/k3.err b/regress/bin/ed/k3.err
similarity index 100%
rename from bin/ed/test/k3.err
rename to regress/bin/ed/k3.err
diff --git a/bin/ed/test/k4.err b/regress/bin/ed/k4.err
similarity index 100%
rename from bin/ed/test/k4.err
rename to regress/bin/ed/k4.err
diff --git a/bin/ed/test/l.d b/regress/bin/ed/l.d
similarity index 100%
rename from bin/ed/test/l.d
rename to regress/bin/ed/l.d
diff --git a/bin/ed/test/l.r b/regress/bin/ed/l.r
similarity index 100%
rename from bin/ed/test/l.r
rename to regress/bin/ed/l.r
diff --git a/bin/ed/test/l.t b/regress/bin/ed/l.t
similarity index 100%
rename from bin/ed/test/l.t
rename to regress/bin/ed/l.t
diff --git a/bin/ed/test/m.d b/regress/bin/ed/m.d
similarity index 100%
rename from bin/ed/test/m.d
rename to regress/bin/ed/m.d
diff --git a/bin/ed/test/m.err b/regress/bin/ed/m.err
similarity index 100%
rename from bin/ed/test/m.err
rename to regress/bin/ed/m.err
diff --git a/bin/ed/test/m.r b/regress/bin/ed/m.r
similarity index 100%
rename from bin/ed/test/m.r
rename to regress/bin/ed/m.r
diff --git a/bin/ed/test/m.t b/regress/bin/ed/m.t
similarity index 100%
rename from bin/ed/test/m.t
rename to regress/bin/ed/m.t
diff --git a/bin/ed/test/mkscripts.sh b/regress/bin/ed/mkscripts.sh
similarity index 95%
rename from bin/ed/test/mkscripts.sh
rename to regress/bin/ed/mkscripts.sh
index 2bf9b213235..25c0a0a2401 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/regress/bin/ed/mkscripts.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: mkscripts.sh,v 1.2 1996/06/23 14:20:08 deraadt Exp $
+#	$OpenBSD: mkscripts.sh,v 1.1 2024/08/19 01:43:23 deraadt Exp $
 #	$NetBSD: mkscripts.sh,v 1.10 1995/04/23 10:07:36 cgd Exp $
 #
 # This script generates ed test scripts (.ed) from .t files
diff --git a/bin/ed/test/n.d b/regress/bin/ed/n.d
similarity index 100%
rename from bin/ed/test/n.d
rename to regress/bin/ed/n.d
diff --git a/bin/ed/test/n.r b/regress/bin/ed/n.r
similarity index 100%
rename from bin/ed/test/n.r
rename to regress/bin/ed/n.r
diff --git a/bin/ed/test/n.t b/regress/bin/ed/n.t
similarity index 100%
rename from bin/ed/test/n.t
rename to regress/bin/ed/n.t
diff --git a/bin/ed/test/nl1.d b/regress/bin/ed/nl1.d
similarity index 100%
rename from bin/ed/test/nl1.d
rename to regress/bin/ed/nl1.d
diff --git a/bin/ed/test/nl1.r b/regress/bin/ed/nl1.r
similarity index 100%
rename from bin/ed/test/nl1.r
rename to regress/bin/ed/nl1.r
diff --git a/bin/ed/test/nl1.t b/regress/bin/ed/nl1.t
similarity index 100%
rename from bin/ed/test/nl1.t
rename to regress/bin/ed/nl1.t
diff --git a/bin/ed/test/nl2.d b/regress/bin/ed/nl2.d
similarity index 100%
rename from bin/ed/test/nl2.d
rename to regress/bin/ed/nl2.d
diff --git a/bin/ed/test/nl2.r b/regress/bin/ed/nl2.r
similarity index 100%
rename from bin/ed/test/nl2.r
rename to regress/bin/ed/nl2.r
diff --git a/bin/ed/test/nl2.t b/regress/bin/ed/nl2.t
similarity index 100%
rename from bin/ed/test/nl2.t
rename to regress/bin/ed/nl2.t
diff --git a/bin/ed/test/p.d b/regress/bin/ed/p.d
similarity index 100%
rename from bin/ed/test/p.d
rename to regress/bin/ed/p.d
diff --git a/bin/ed/test/p.r b/regress/bin/ed/p.r
similarity index 100%
rename from bin/ed/test/p.r
rename to regress/bin/ed/p.r
diff --git a/bin/ed/test/p.t b/regress/bin/ed/p.t
similarity index 100%
rename from bin/ed/test/p.t
rename to regress/bin/ed/p.t
diff --git a/bin/ed/test/q.d b/regress/bin/ed/q.d
similarity index 100%
rename from bin/ed/test/q.d
rename to regress/bin/ed/q.d
diff --git a/bin/ed/test/q.r b/regress/bin/ed/q.r
similarity index 100%
rename from bin/ed/test/q.r
rename to regress/bin/ed/q.r
diff --git a/bin/ed/test/q.t b/regress/bin/ed/q.t
similarity index 100%
rename from bin/ed/test/q.t
rename to regress/bin/ed/q.t
diff --git a/bin/ed/test/q1.err b/regress/bin/ed/q1.err
similarity index 100%
rename from bin/ed/test/q1.err
rename to regress/bin/ed/q1.err
diff --git a/bin/ed/test/r1.d b/regress/bin/ed/r1.d
similarity index 100%
rename from bin/ed/test/r1.d
rename to regress/bin/ed/r1.d
diff --git a/bin/ed/test/r1.err b/regress/bin/ed/r1.err
similarity index 100%
rename from bin/ed/test/r1.err
rename to regress/bin/ed/r1.err
diff --git a/bin/ed/test/r1.r b/regress/bin/ed/r1.r
similarity index 100%
rename from bin/ed/test/r1.r
rename to regress/bin/ed/r1.r
diff --git a/bin/ed/test/r1.t b/regress/bin/ed/r1.t
similarity index 100%
rename from bin/ed/test/r1.t
rename to regress/bin/ed/r1.t
diff --git a/bin/ed/test/r2.d b/regress/bin/ed/r2.d
similarity index 100%
rename from bin/ed/test/r2.d
rename to regress/bin/ed/r2.d
diff --git a/bin/ed/test/r2.err b/regress/bin/ed/r2.err
similarity index 100%
rename from bin/ed/test/r2.err
rename to regress/bin/ed/r2.err
diff --git a/bin/ed/test/r2.r b/regress/bin/ed/r2.r
similarity index 100%
rename from bin/ed/test/r2.r
rename to regress/bin/ed/r2.r
diff --git a/bin/ed/test/r2.t b/regress/bin/ed/r2.t
similarity index 100%
rename from bin/ed/test/r2.t
rename to regress/bin/ed/r2.t
diff --git a/bin/ed/test/r3.d b/regress/bin/ed/r3.d
similarity index 100%
rename from bin/ed/test/r3.d
rename to regress/bin/ed/r3.d
diff --git a/bin/ed/test/r3.r b/regress/bin/ed/r3.r
similarity index 100%
rename from bin/ed/test/r3.r
rename to regress/bin/ed/r3.r
diff --git a/bin/ed/test/r3.t b/regress/bin/ed/r3.t
similarity index 100%
rename from bin/ed/test/r3.t
rename to regress/bin/ed/r3.t
diff --git a/bin/ed/test/s1.d b/regress/bin/ed/s1.d
similarity index 100%
rename from bin/ed/test/s1.d
rename to regress/bin/ed/s1.d
diff --git a/bin/ed/test/s1.err b/regress/bin/ed/s1.err
similarity index 100%
rename from bin/ed/test/s1.err
rename to regress/bin/ed/s1.err
diff --git a/bin/ed/test/s1.r b/regress/bin/ed/s1.r
similarity index 100%
rename from bin/ed/test/s1.r
rename to regress/bin/ed/s1.r
diff --git a/bin/ed/test/s1.t b/regress/bin/ed/s1.t
similarity index 100%
rename from bin/ed/test/s1.t
rename to regress/bin/ed/s1.t
diff --git a/bin/ed/test/s10.err b/regress/bin/ed/s10.err
similarity index 100%
rename from bin/ed/test/s10.err
rename to regress/bin/ed/s10.err
diff --git a/bin/ed/test/s2.d b/regress/bin/ed/s2.d
similarity index 100%
rename from bin/ed/test/s2.d
rename to regress/bin/ed/s2.d
diff --git a/bin/ed/test/s2.r b/regress/bin/ed/s2.r
similarity index 100%
rename from bin/ed/test/s2.r
rename to regress/bin/ed/s2.r
diff --git a/bin/ed/test/s2.t b/regress/bin/ed/s2.t
similarity index 100%
rename from bin/ed/test/s2.t
rename to regress/bin/ed/s2.t
diff --git a/bin/ed/test/s3.d b/regress/bin/ed/s3.d
similarity index 100%
rename from bin/ed/test/s3.d
rename to regress/bin/ed/s3.d
diff --git a/bin/ed/test/s3.err b/regress/bin/ed/s3.err
similarity index 100%
rename from bin/ed/test/s3.err
rename to regress/bin/ed/s3.err
diff --git a/bin/ed/test/s3.r b/regress/bin/ed/s3.r
similarity index 100%
rename from bin/ed/test/s3.r
rename to regress/bin/ed/s3.r
diff --git a/bin/ed/test/s3.t b/regress/bin/ed/s3.t
similarity index 100%
rename from bin/ed/test/s3.t
rename to regress/bin/ed/s3.t
diff --git a/bin/ed/test/s4.d b/regress/bin/ed/s4.d
similarity index 100%
rename from bin/ed/test/s4.d
rename to regress/bin/ed/s4.d
diff --git a/bin/ed/test/s4.err b/regress/bin/ed/s4.err
similarity index 100%
rename from bin/ed/test/s4.err
rename to regress/bin/ed/s4.err
diff --git a/bin/ed/test/s4.r b/regress/bin/ed/s4.r
similarity index 100%
rename from bin/ed/test/s4.r
rename to regress/bin/ed/s4.r
diff --git a/bin/ed/test/s4.t b/regress/bin/ed/s4.t
similarity index 100%
rename from bin/ed/test/s4.t
rename to regress/bin/ed/s4.t
diff --git a/bin/ed/test/s5.err b/regress/bin/ed/s5.err
similarity index 100%
rename from bin/ed/test/s5.err
rename to regress/bin/ed/s5.err
diff --git a/bin/ed/test/s6.err b/regress/bin/ed/s6.err
similarity index 100%
rename from bin/ed/test/s6.err
rename to regress/bin/ed/s6.err
diff --git a/bin/ed/test/s7.err b/regress/bin/ed/s7.err
similarity index 100%
rename from bin/ed/test/s7.err
rename to regress/bin/ed/s7.err
diff --git a/bin/ed/test/s8.err b/regress/bin/ed/s8.err
similarity index 100%
rename from bin/ed/test/s8.err
rename to regress/bin/ed/s8.err
diff --git a/bin/ed/test/s9.err b/regress/bin/ed/s9.err
similarity index 100%
rename from bin/ed/test/s9.err
rename to regress/bin/ed/s9.err
diff --git a/bin/ed/test/t.d b/regress/bin/ed/t.d
similarity index 100%
rename from bin/ed/test/t.d
rename to regress/bin/ed/t.d
diff --git a/bin/ed/test/t.r b/regress/bin/ed/t.r
similarity index 100%
rename from bin/ed/test/t.r
rename to regress/bin/ed/t.r
diff --git a/bin/ed/test/t.t b/regress/bin/ed/t.t
similarity index 100%
rename from bin/ed/test/t.t
rename to regress/bin/ed/t.t
diff --git a/bin/ed/test/t1.d b/regress/bin/ed/t1.d
similarity index 100%
rename from bin/ed/test/t1.d
rename to regress/bin/ed/t1.d
diff --git a/bin/ed/test/t1.err b/regress/bin/ed/t1.err
similarity index 100%
rename from bin/ed/test/t1.err
rename to regress/bin/ed/t1.err
diff --git a/bin/ed/test/t1.r b/regress/bin/ed/t1.r
similarity index 100%
rename from bin/ed/test/t1.r
rename to regress/bin/ed/t1.r
diff --git a/bin/ed/test/t1.t b/regress/bin/ed/t1.t
similarity index 100%
rename from bin/ed/test/t1.t
rename to regress/bin/ed/t1.t
diff --git a/bin/ed/test/t2.d b/regress/bin/ed/t2.d
similarity index 100%
rename from bin/ed/test/t2.d
rename to regress/bin/ed/t2.d
diff --git a/bin/ed/test/t2.err b/regress/bin/ed/t2.err
similarity index 100%
rename from bin/ed/test/t2.err
rename to regress/bin/ed/t2.err
diff --git a/bin/ed/test/t2.r b/regress/bin/ed/t2.r
similarity index 100%
rename from bin/ed/test/t2.r
rename to regress/bin/ed/t2.r
diff --git a/bin/ed/test/t2.t b/regress/bin/ed/t2.t
similarity index 100%
rename from bin/ed/test/t2.t
rename to regress/bin/ed/t2.t
diff --git a/bin/ed/test/u.d b/regress/bin/ed/u.d
similarity index 100%
rename from bin/ed/test/u.d
rename to regress/bin/ed/u.d
diff --git a/bin/ed/test/u.err b/regress/bin/ed/u.err
similarity index 100%
rename from bin/ed/test/u.err
rename to regress/bin/ed/u.err
diff --git a/bin/ed/test/u.r b/regress/bin/ed/u.r
similarity index 100%
rename from bin/ed/test/u.r
rename to regress/bin/ed/u.r
diff --git a/bin/ed/test/u.t b/regress/bin/ed/u.t
similarity index 100%
rename from bin/ed/test/u.t
rename to regress/bin/ed/u.t
diff --git a/bin/ed/test/v.d b/regress/bin/ed/v.d
similarity index 100%
rename from bin/ed/test/v.d
rename to regress/bin/ed/v.d
diff --git a/bin/ed/test/v.r b/regress/bin/ed/v.r
similarity index 100%
rename from bin/ed/test/v.r
rename to regress/bin/ed/v.r
diff --git a/bin/ed/test/v.t b/regress/bin/ed/v.t
similarity index 100%
rename from bin/ed/test/v.t
rename to regress/bin/ed/v.t
diff --git a/bin/ed/test/w.d b/regress/bin/ed/w.d
similarity index 100%
rename from bin/ed/test/w.d
rename to regress/bin/ed/w.d
diff --git a/bin/ed/test/w.r b/regress/bin/ed/w.r
similarity index 100%
rename from bin/ed/test/w.r
rename to regress/bin/ed/w.r
diff --git a/bin/ed/test/w.t b/regress/bin/ed/w.t
similarity index 100%
rename from bin/ed/test/w.t
rename to regress/bin/ed/w.t
diff --git a/bin/ed/test/w1.err b/regress/bin/ed/w1.err
similarity index 100%
rename from bin/ed/test/w1.err
rename to regress/bin/ed/w1.err
diff --git a/bin/ed/test/w2.err b/regress/bin/ed/w2.err
similarity index 100%
rename from bin/ed/test/w2.err
rename to regress/bin/ed/w2.err
diff --git a/bin/ed/test/w3.err b/regress/bin/ed/w3.err
similarity index 100%
rename from bin/ed/test/w3.err
rename to regress/bin/ed/w3.err
diff --git a/bin/ed/test/x.err b/regress/bin/ed/x.err
similarity index 100%
rename from bin/ed/test/x.err
rename to regress/bin/ed/x.err
diff --git a/bin/ed/test/z.err b/regress/bin/ed/z.err
similarity index 100%
rename from bin/ed/test/z.err
rename to regress/bin/ed/z.err
-- 
2.20.1