From f464137598c98f8dd2f4c76a79a2f1b17c0c902f Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 17:49:22 -0700 Subject: [PATCH 1/6] ignore the sys dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ba077a4..7c14517 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bin +sys From 106d528ef63554e7042f25266490dedb13b6cfdf Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 17:58:22 -0700 Subject: [PATCH 2/6] updated makefile --- Makefile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fd2dc2b..19a0f7c 100644 --- a/Makefile +++ b/Makefile @@ -41,13 +41,20 @@ cmd: dirs # $(AS) $(ASARGS) -o $(CMDDIR)/ed2 src/cmd/ed2.s # $(AS) $(ASARGS) -o $(CMDDIR)/init src/cmd/init.s -others: - $(AS) $(ASARGS) -o $(CMDDIR)/ls src/other/wktls.s - $(AS) $(ASARGS) -o $(CMDDIR)/sh src/other/pbsh.s - $(AS) $(ASARGS) -o $(CMDDIR)/stat src/other/wktstat.s - $(AS) $(ASARGS) -o $(CMDDIR)/mv src/other/wktmv.s - $(AS) $(ASARGS) -o $(CMDDIR)/ln src/other/wktln.s - $(AS) $(ASARGS) -o $(CMDDIR)/date src/other/wktdate.s +others: dirs + $(AS) $(ASARGS) -o $(CMDDIR)/pbsh src/other/pbsh.s + $(AS) $(ASARGS) -o $(CMDDIR)/ops src/other/ops.s + +# wkt apps + $(AS) $(ASARGS) -o $(CMDDIR)/wktls src/other/wktls.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktcat src/other/wktcat.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktcp src/other/wktcp.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktdate src/other/wktdate.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktln src/other/wktln.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktls src/other/wktls.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktmv src/other/wktmv.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktopr src/other/wktopr.s + $(AS) $(ASARGS) -o $(CMDDIR)/wktstat src/other/wktstat.s clean: rm -rf $(SYSDIR)/* From e3f30f66283d41bfc2dede1aa30e7855e2ee3159 Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 18:08:30 -0700 Subject: [PATCH 3/6] relocated tests --- Makefile | 12 +++++++++++- src/{other => tests}/decimal_out.s | 0 src/{other => tests}/fork_test.s | 0 src/{other => tests}/octal_test.s | 0 src/{other => tests}/testmul.s | 0 src/{other => tests}/write_test.s | 0 6 files changed, 11 insertions(+), 1 deletion(-) rename src/{other => tests}/decimal_out.s (100%) rename src/{other => tests}/fork_test.s (100%) rename src/{other => tests}/octal_test.s (100%) rename src/{other => tests}/testmul.s (100%) rename src/{other => tests}/write_test.s (100%) diff --git a/Makefile b/Makefile index 19a0f7c..8c98540 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,9 @@ AS=tools/as7 ASARGS=--format=ptr SYSDIR=sys CMDDIR=bin +TESTDIR=tests -all: sys cmd others +all: sys cmd others tests runsh: all cd bin && ../tools/a7out sh @@ -12,6 +13,7 @@ runsh: all dirs: mkdir -p $(SYSDIR) mkdir -p $(CMDDIR) + mkdir -p $(TESTDIR) sys: dirs $(AS) $(ASARGS) -o $(SYSDIR)/unix src/sys/*.s @@ -56,6 +58,14 @@ others: dirs $(AS) $(ASARGS) -o $(CMDDIR)/wktopr src/other/wktopr.s $(AS) $(ASARGS) -o $(CMDDIR)/wktstat src/other/wktstat.s +tests: dirs + $(AS) $(ASARGS) -o $(TESTDIR)/decimal_out src/tests/decimal_out.s + $(AS) $(ASARGS) -o $(TESTDIR)/fork_test src/tests/fork_test.s + $(AS) $(ASARGS) -o $(TESTDIR)/octal_test src/tests/octal_test.s + $(AS) $(ASARGS) -o $(TESTDIR)/testmul src/tests/testmul.s + $(AS) $(ASARGS) -o $(TESTDIR)/write_test src/tests/write_test.s + clean: rm -rf $(SYSDIR)/* rm -rf $(CMDDIR)/* + rm -rf $(TESTDIR)/* diff --git a/src/other/decimal_out.s b/src/tests/decimal_out.s similarity index 100% rename from src/other/decimal_out.s rename to src/tests/decimal_out.s diff --git a/src/other/fork_test.s b/src/tests/fork_test.s similarity index 100% rename from src/other/fork_test.s rename to src/tests/fork_test.s diff --git a/src/other/octal_test.s b/src/tests/octal_test.s similarity index 100% rename from src/other/octal_test.s rename to src/tests/octal_test.s diff --git a/src/other/testmul.s b/src/tests/testmul.s similarity index 100% rename from src/other/testmul.s rename to src/tests/testmul.s diff --git a/src/other/write_test.s b/src/tests/write_test.s similarity index 100% rename from src/other/write_test.s rename to src/tests/write_test.s From 88583545d225df9d5f6e7ca1182a45fc605e1bec Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 18:11:18 -0700 Subject: [PATCH 4/6] script to run tests --- .gitignore | 6 ++++-- Makefile | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c14517..4f26ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -bin -sys +/bin +/sys +/tests + diff --git a/Makefile b/Makefile index 8c98540..e20a37e 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ tests: dirs $(AS) $(ASARGS) -o $(TESTDIR)/testmul src/tests/testmul.s $(AS) $(ASARGS) -o $(TESTDIR)/write_test src/tests/write_test.s +runtests: tests + cd tests && ../tools/a7out decimal_out + cd tests && ../tools/a7out fork_test + cd tests && ../tools/a7out octal_test +# cd tests && ../tools/a7out testmul +# cd tests && ../tools/a7out write_test + clean: rm -rf $(SYSDIR)/* rm -rf $(CMDDIR)/* From bc91a11e2a1e063ecd598858fd4a1706bcfb1443 Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 18:14:01 -0700 Subject: [PATCH 5/6] oops, pbsh should compile to sh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e20a37e..76c075f 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ cmd: dirs # $(AS) $(ASARGS) -o $(CMDDIR)/init src/cmd/init.s others: dirs - $(AS) $(ASARGS) -o $(CMDDIR)/pbsh src/other/pbsh.s + $(AS) $(ASARGS) -o $(CMDDIR)/sh src/other/pbsh.s $(AS) $(ASARGS) -o $(CMDDIR)/ops src/other/ops.s # wkt apps From d96db88df7caed44e3275ea5001190d79af2e64c Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Tue, 8 Mar 2016 20:54:28 -0700 Subject: [PATCH 6/6] add ed to the Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 76c075f..07b032e 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,7 @@ cmd: dirs # $(AS) $(ASARGS) -o $(CMDDIR)/dskres src/cmd/dskres.s # $(AS) $(ASARGS) -o $(CMDDIR)/dsksav src/cmd/dsksav.s # $(AS) $(ASARGS) -o $(CMDDIR)/dsw src/cmd/dsw.s -# $(AS) $(ASARGS) -o $(CMDDIR)/ed1 src/cmd/ed1.s -# $(AS) $(ASARGS) -o $(CMDDIR)/ed2 src/cmd/ed2.s + $(AS) $(ASARGS) -o $(CMDDIR)/ed src/cmd/ed2.s src/cmd/ed1.s # $(AS) $(ASARGS) -o $(CMDDIR)/init src/cmd/init.s others: dirs