Move "tests" folder to root

README.md

@@ -37,8 +37,7 @@ path to giving Collapse OS a try.
 * `tools`: Tools for working with Collapse OS from "modern" environments. Mostly
            development tools, but also contains emulated zasm, which is
            necessary to build Collapse OS from a non-Collapse OS machine.
-
-Each folder has a README with more details.
+* `tests`: Automated test suite for the whole project.
 
 ## Status
 

runtests.sh

@@ -4,15 +4,9 @@ git submodule init
 git submodule update
 git clean -fxd
 
-cd tools/emul
-make
-
-cd ../tests
-make
+make -C tools/emul
+make -C tests
 
 # let's try again with an updated zasm
-cd ../emul
-make updatebootstrap all
-
-cd ../tests
-make
+make -C tools/emul updatebootstrap all
+make -C tests

tests/Makefile

@@ -1,5 +1,5 @@
-EMULDIR = ../emul
-CFSPACK = ../cfspack/cfspack
+EMULDIR = ../tools/emul
+CFSPACK = ../tools/cfspack/cfspack
 
 .PHONY: run
 run:
@@ -10,7 +10,7 @@ run:
 	cd shell && ./runtests.sh
 
 $(CFSPACK):
-	$(MAKE) -C ../cfspack
+	$(MAKE) -C ../tools/cfspack
 
 .PHONY: cfs
 cfs: $(CFSPACK)

tests/avra/runtests.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-ZASM=../../zasm.sh
-AVRINC=../../../avr
+ZASM=../../tools/zasm.sh
+AVRINC=../../avr
 
 cmpas() {
     FN=$1

tests/shell/runtests.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-EMULDIR=../../emul
-SHELL=../../emul/shell/shell
+EMULDIR=../../tools/emul
+SHELL="${EMULDIR}/shell/shell"
 
 replay() {
     fn=$1

tests/unit/runtests.sh

@@ -2,8 +2,8 @@
 set -e
 # TODO: find POSIX substitute to that PIPESTATUS thing
 
-BASE=../../..
-TOOLS=../..
+BASE=../..
+TOOLS="${BASE}/tools"
 ZASM="${TOOLS}/zasm.sh"
 RUNBIN="${TOOLS}/emul/runbin/runbin"
 KERNEL="${BASE}/kernel"

tests/zasm/errtests.sh

@@ -2,7 +2,7 @@
 
 # no "set -e" because we test errors
 
-ZASM=../../zasm.sh
+ZASM=../../tools/zasm.sh
 
 chkerr() {
     echo "Check that '$1' results in error $2"

tests/zasm/runtests.sh

@@ -1,9 +1,10 @@
 #!/bin/sh -e
 
-KERNEL=../../../kernel
-APPS=../../../apps
-ZASM=../../zasm.sh
-ASMFILE=${APPS}/zasm/instr.asm
+BASE=../..
+KERNEL="${BASE}/kernel"
+APPS="${BASE}/apps"
+ZASM="${BASE}/tools/zasm.sh"
+ASMFILE="${APPS}/zasm/instr.asm"
 
 cmpas() {
     FN=$1