From 4cd0ac1aced3ed0a0d5a039caf563fc9dd41cbc7 Mon Sep 17 00:00:00 2001
From: Dale Schumacher <dalnefre@yahoo.com>
Date: Tue, 24 Jun 2014 11:03:08 -0500
Subject: [PATCH] Pruned tests and Makefile

Kept nice test cases for reference, but bare-metal will obviously not
be command-line driven.
---
 Makefile                                      | 22 +++----------------
 README.md                                     |  2 +-
 perf_dupdrop.c => tests/perf_dupdrop.c        |  0
 perf_dupdrop.f => tests/perf_dupdrop.f        |  0
 test_comparison.f => tests/test_comparison.f  |  0
 .../test_comparison.f.out                     |  0
 test_exception.f => tests/test_exception.f    |  0
 .../test_exception.f.out                      |  0
 test_nqueens.f => tests/test_nqueens.f        |  0
 .../test_nqueens.f.out                        |  0
 test_number.f => tests/test_number.f          |  0
 test_number.f.out => tests/test_number.f.out  |  0
 test_read_file.f => tests/test_read_file.f    |  0
 .../test_read_file.f.out                      |  0
 test_stack.f => tests/test_stack.f            |  0
 test_stack.f.out => tests/test_stack.f.out    |  0
 .../test_stack_trace.f                        |  0
 .../test_stack_trace.f.out                    |  0
 18 files changed, 4 insertions(+), 20 deletions(-)
 rename perf_dupdrop.c => tests/perf_dupdrop.c (100%)
 rename perf_dupdrop.f => tests/perf_dupdrop.f (100%)
 rename test_comparison.f => tests/test_comparison.f (100%)
 rename test_comparison.f.out => tests/test_comparison.f.out (100%)
 rename test_exception.f => tests/test_exception.f (100%)
 rename test_exception.f.out => tests/test_exception.f.out (100%)
 rename test_nqueens.f => tests/test_nqueens.f (100%)
 rename test_nqueens.f.out => tests/test_nqueens.f.out (100%)
 rename test_number.f => tests/test_number.f (100%)
 rename test_number.f.out => tests/test_number.f.out (100%)
 rename test_read_file.f => tests/test_read_file.f (100%)
 rename test_read_file.f.out => tests/test_read_file.f.out (100%)
 rename test_stack.f => tests/test_stack.f (100%)
 rename test_stack.f.out => tests/test_stack.f.out (100%)
 rename test_stack_trace.f => tests/test_stack_trace.f (100%)
 rename test_stack_trace.f.out => tests/test_stack_trace.f.out (100%)

diff --git a/Makefile b/Makefile
index ef177bb..7cd5414 100644
--- a/Makefile
+++ b/Makefile
@@ -14,23 +14,7 @@ run:
 	cat jonesforth.f $(PROG) - | ./jonesforth
 
 clean:
-	rm -f jonesforth perf_dupdrop *~ core .test_*
+	rm -f jonesforth *~ core
 
-# Tests.
-
-TESTS	:= $(patsubst %.f,%.test,$(wildcard test_*.f))
-
-test check: $(TESTS)
-
-test_%.test: test_%.f jonesforth
-	@echo -n "$< ... "
-	@rm -f .$@
-	@cat <(echo ': TEST-MODE ;') jonesforth.f $< <(echo 'TEST') | \
-	  ./jonesforth 2>&1 | \
-	  sed 's/DSP=[0-9]*//g' > .$@
-	@diff -u .$@ $<.out
-	@rm -f .$@
-	@echo "ok"
-
-.SUFFIXES: .f .test
-.PHONY: test check run run_perf_dupdrop
+.SUFFIXES: .f
+.PHONY: run
diff --git a/README.md b/README.md
index fa3e146..1884ffb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Raspberry Pi JonesFORTH Operating System
+# Raspberry Pi JonesFORTH O/S
 
 A bare-metal operating system for Raspberry Pi,
 based on _Jonesforth-ARM_ <https://github.com/M2IHP13-admin/JonesForth-arm>.
diff --git a/perf_dupdrop.c b/tests/perf_dupdrop.c
similarity index 100%
rename from perf_dupdrop.c
rename to tests/perf_dupdrop.c
diff --git a/perf_dupdrop.f b/tests/perf_dupdrop.f
similarity index 100%
rename from perf_dupdrop.f
rename to tests/perf_dupdrop.f
diff --git a/test_comparison.f b/tests/test_comparison.f
similarity index 100%
rename from test_comparison.f
rename to tests/test_comparison.f
diff --git a/test_comparison.f.out b/tests/test_comparison.f.out
similarity index 100%
rename from test_comparison.f.out
rename to tests/test_comparison.f.out
diff --git a/test_exception.f b/tests/test_exception.f
similarity index 100%
rename from test_exception.f
rename to tests/test_exception.f
diff --git a/test_exception.f.out b/tests/test_exception.f.out
similarity index 100%
rename from test_exception.f.out
rename to tests/test_exception.f.out
diff --git a/test_nqueens.f b/tests/test_nqueens.f
similarity index 100%
rename from test_nqueens.f
rename to tests/test_nqueens.f
diff --git a/test_nqueens.f.out b/tests/test_nqueens.f.out
similarity index 100%
rename from test_nqueens.f.out
rename to tests/test_nqueens.f.out
diff --git a/test_number.f b/tests/test_number.f
similarity index 100%
rename from test_number.f
rename to tests/test_number.f
diff --git a/test_number.f.out b/tests/test_number.f.out
similarity index 100%
rename from test_number.f.out
rename to tests/test_number.f.out
diff --git a/test_read_file.f b/tests/test_read_file.f
similarity index 100%
rename from test_read_file.f
rename to tests/test_read_file.f
diff --git a/test_read_file.f.out b/tests/test_read_file.f.out
similarity index 100%
rename from test_read_file.f.out
rename to tests/test_read_file.f.out
diff --git a/test_stack.f b/tests/test_stack.f
similarity index 100%
rename from test_stack.f
rename to tests/test_stack.f
diff --git a/test_stack.f.out b/tests/test_stack.f.out
similarity index 100%
rename from test_stack.f.out
rename to tests/test_stack.f.out
diff --git a/test_stack_trace.f b/tests/test_stack_trace.f
similarity index 100%
rename from test_stack_trace.f
rename to tests/test_stack_trace.f
diff --git a/test_stack_trace.f.out b/tests/test_stack_trace.f.out
similarity index 100%
rename from test_stack_trace.f.out
rename to tests/test_stack_trace.f.out