From 22c7eeaa5d1cc9263d4b8f4c7f0dcd443ecdbd49 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Thu, 16 May 2019 11:23:15 -0400 Subject: [PATCH] Move apps/zasm/tests to tools/tests/zasm This 'apps' folder is going to disappear. Everything is going to be a "part" to be assembled through recipes. 'apps' has no meaning. --- {apps/zasm/tests => tools/tests/zasm}/Makefile | 0 {apps/zasm/tests => tools/tests/zasm}/geninstrs.py | 0 {apps/zasm/tests => tools/tests/zasm}/runtests.sh | 4 ++-- {apps/zasm/tests => tools/tests/zasm}/test1.asm | 0 {apps/zasm/tests => tools/tests/zasm}/test2.asm | 0 {apps/zasm/tests => tools/tests/zasm}/test3.asm | 0 {apps/zasm/tests => tools/tests/zasm}/test4.asm | 0 {apps/zasm/tests => tools/tests/zasm}/test5.asm | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {apps/zasm/tests => tools/tests/zasm}/Makefile (100%) rename {apps/zasm/tests => tools/tests/zasm}/geninstrs.py (100%) rename {apps/zasm/tests => tools/tests/zasm}/runtests.sh (90%) rename {apps/zasm/tests => tools/tests/zasm}/test1.asm (100%) rename {apps/zasm/tests => tools/tests/zasm}/test2.asm (100%) rename {apps/zasm/tests => tools/tests/zasm}/test3.asm (100%) rename {apps/zasm/tests => tools/tests/zasm}/test4.asm (100%) rename {apps/zasm/tests => tools/tests/zasm}/test5.asm (100%) diff --git a/apps/zasm/tests/Makefile b/tools/tests/zasm/Makefile similarity index 100% rename from apps/zasm/tests/Makefile rename to tools/tests/zasm/Makefile diff --git a/apps/zasm/tests/geninstrs.py b/tools/tests/zasm/geninstrs.py similarity index 100% rename from apps/zasm/tests/geninstrs.py rename to tools/tests/zasm/geninstrs.py diff --git a/apps/zasm/tests/runtests.sh b/tools/tests/zasm/runtests.sh similarity index 90% rename from apps/zasm/tests/runtests.sh rename to tools/tests/zasm/runtests.sh index 34ae4fd..0d54775 100755 --- a/apps/zasm/tests/runtests.sh +++ b/tools/tests/zasm/runtests.sh @@ -4,8 +4,8 @@ set -e TMPFILE=$(mktemp) SCAS=scas -ZASM=../../../tools/emul/zasm -ASMFILE=../instr.asm +ZASM=../../emul/zasm +ASMFILE=../../../apps/zasm/instr.asm cmpas() { EXPECTED=$($SCAS -o - "$1" | xxd) diff --git a/apps/zasm/tests/test1.asm b/tools/tests/zasm/test1.asm similarity index 100% rename from apps/zasm/tests/test1.asm rename to tools/tests/zasm/test1.asm diff --git a/apps/zasm/tests/test2.asm b/tools/tests/zasm/test2.asm similarity index 100% rename from apps/zasm/tests/test2.asm rename to tools/tests/zasm/test2.asm diff --git a/apps/zasm/tests/test3.asm b/tools/tests/zasm/test3.asm similarity index 100% rename from apps/zasm/tests/test3.asm rename to tools/tests/zasm/test3.asm diff --git a/apps/zasm/tests/test4.asm b/tools/tests/zasm/test4.asm similarity index 100% rename from apps/zasm/tests/test4.asm rename to tools/tests/zasm/test4.asm diff --git a/apps/zasm/tests/test5.asm b/tools/tests/zasm/test5.asm similarity index 100% rename from apps/zasm/tests/test5.asm rename to tools/tests/zasm/test5.asm