From 55287b4cb00e1e6f507677a85cb8431de98abd98 Mon Sep 17 00:00:00 2001 From: Peter Evans Date: Fri, 13 Apr 2018 19:09:23 -0500 Subject: [PATCH] Reorganizing test files --- tests/CMakeLists.txt | 4 +++- tests/{ => apple2}/apple2.c | 0 tests/{apple2.bank.c => apple2/bank.c} | 0 tests/{apple2.dbuf.c => apple2/dbuf.c} | 0 tests/{apple2.dd.c => apple2/dd.c} | 0 tests/{apple2.dec.c => apple2/dec.c} | 0 tests/{apple2.draw.c => apple2/draw.c} | 0 tests/{apple2.enc.c => apple2/enc.c} | 0 tests/{apple2.hires.c => apple2/hires.c} | 0 tests/{apple2.kb.c => apple2/kb.c} | 0 tests/{apple2.lores.c => apple2/lores.c} | 0 tests/{apple2.mem.c => apple2/mem.c} | 0 tests/{apple2.pc.c => apple2/pc.c} | 0 tests/{apple2.reflect.c => apple2/reflect.c} | 0 tests/{apple2.text.c => apple2/text.c} | 0 tests/{mos6502.addr.c => mos6502/addr.c} | 0 tests/{mos6502.arith.c => mos6502/arith.c} | 0 tests/{mos6502.bits.c => mos6502/bits.c} | 0 tests/{mos6502.branch.c => mos6502/branch.c} | 0 tests/{mos6502.dis.c => mos6502/dis.c} | 0 tests/{mos6502.exec.c => mos6502/exec.c} | 0 tests/{mos6502.loadstor.c => mos6502/loadstor.c} | 0 tests/{ => mos6502}/mos6502.c | 0 tests/{mos6502.stat.c => mos6502/stat.c} | 0 24 files changed, 3 insertions(+), 1 deletion(-) rename tests/{ => apple2}/apple2.c (100%) rename tests/{apple2.bank.c => apple2/bank.c} (100%) rename tests/{apple2.dbuf.c => apple2/dbuf.c} (100%) rename tests/{apple2.dd.c => apple2/dd.c} (100%) rename tests/{apple2.dec.c => apple2/dec.c} (100%) rename tests/{apple2.draw.c => apple2/draw.c} (100%) rename tests/{apple2.enc.c => apple2/enc.c} (100%) rename tests/{apple2.hires.c => apple2/hires.c} (100%) rename tests/{apple2.kb.c => apple2/kb.c} (100%) rename tests/{apple2.lores.c => apple2/lores.c} (100%) rename tests/{apple2.mem.c => apple2/mem.c} (100%) rename tests/{apple2.pc.c => apple2/pc.c} (100%) rename tests/{apple2.reflect.c => apple2/reflect.c} (100%) rename tests/{apple2.text.c => apple2/text.c} (100%) rename tests/{mos6502.addr.c => mos6502/addr.c} (100%) rename tests/{mos6502.arith.c => mos6502/arith.c} (100%) rename tests/{mos6502.bits.c => mos6502/bits.c} (100%) rename tests/{mos6502.branch.c => mos6502/branch.c} (100%) rename tests/{mos6502.dis.c => mos6502/dis.c} (100%) rename tests/{mos6502.exec.c => mos6502/exec.c} (100%) rename tests/{mos6502.loadstor.c => mos6502/loadstor.c} (100%) rename tests/{ => mos6502}/mos6502.c (100%) rename tests/{mos6502.stat.c => mos6502/stat.c} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 421fcfc..c6ddc27 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -38,10 +38,12 @@ endforeach(src) # test_sources should also include the main source file, so we don't need to # make any particular effort to include it in add_executable(). file(GLOB test_sources "*.c") +file(GLOB_RECURSE mos6502_sources "mos6502/*.c") +file(GLOB_RECURSE apple2_sources "apple2/*.c") add_definitions(-DINSTALL_PATH="../../") -add_executable(erc-test ${sources} ${test_sources}) +add_executable(erc-test ${sources} ${test_sources} ${mos6502_sources} ${apple2_sources}) # Our unit-testing library target_link_libraries(erc-test criterion) diff --git a/tests/apple2.c b/tests/apple2/apple2.c similarity index 100% rename from tests/apple2.c rename to tests/apple2/apple2.c diff --git a/tests/apple2.bank.c b/tests/apple2/bank.c similarity index 100% rename from tests/apple2.bank.c rename to tests/apple2/bank.c diff --git a/tests/apple2.dbuf.c b/tests/apple2/dbuf.c similarity index 100% rename from tests/apple2.dbuf.c rename to tests/apple2/dbuf.c diff --git a/tests/apple2.dd.c b/tests/apple2/dd.c similarity index 100% rename from tests/apple2.dd.c rename to tests/apple2/dd.c diff --git a/tests/apple2.dec.c b/tests/apple2/dec.c similarity index 100% rename from tests/apple2.dec.c rename to tests/apple2/dec.c diff --git a/tests/apple2.draw.c b/tests/apple2/draw.c similarity index 100% rename from tests/apple2.draw.c rename to tests/apple2/draw.c diff --git a/tests/apple2.enc.c b/tests/apple2/enc.c similarity index 100% rename from tests/apple2.enc.c rename to tests/apple2/enc.c diff --git a/tests/apple2.hires.c b/tests/apple2/hires.c similarity index 100% rename from tests/apple2.hires.c rename to tests/apple2/hires.c diff --git a/tests/apple2.kb.c b/tests/apple2/kb.c similarity index 100% rename from tests/apple2.kb.c rename to tests/apple2/kb.c diff --git a/tests/apple2.lores.c b/tests/apple2/lores.c similarity index 100% rename from tests/apple2.lores.c rename to tests/apple2/lores.c diff --git a/tests/apple2.mem.c b/tests/apple2/mem.c similarity index 100% rename from tests/apple2.mem.c rename to tests/apple2/mem.c diff --git a/tests/apple2.pc.c b/tests/apple2/pc.c similarity index 100% rename from tests/apple2.pc.c rename to tests/apple2/pc.c diff --git a/tests/apple2.reflect.c b/tests/apple2/reflect.c similarity index 100% rename from tests/apple2.reflect.c rename to tests/apple2/reflect.c diff --git a/tests/apple2.text.c b/tests/apple2/text.c similarity index 100% rename from tests/apple2.text.c rename to tests/apple2/text.c diff --git a/tests/mos6502.addr.c b/tests/mos6502/addr.c similarity index 100% rename from tests/mos6502.addr.c rename to tests/mos6502/addr.c diff --git a/tests/mos6502.arith.c b/tests/mos6502/arith.c similarity index 100% rename from tests/mos6502.arith.c rename to tests/mos6502/arith.c diff --git a/tests/mos6502.bits.c b/tests/mos6502/bits.c similarity index 100% rename from tests/mos6502.bits.c rename to tests/mos6502/bits.c diff --git a/tests/mos6502.branch.c b/tests/mos6502/branch.c similarity index 100% rename from tests/mos6502.branch.c rename to tests/mos6502/branch.c diff --git a/tests/mos6502.dis.c b/tests/mos6502/dis.c similarity index 100% rename from tests/mos6502.dis.c rename to tests/mos6502/dis.c diff --git a/tests/mos6502.exec.c b/tests/mos6502/exec.c similarity index 100% rename from tests/mos6502.exec.c rename to tests/mos6502/exec.c diff --git a/tests/mos6502.loadstor.c b/tests/mos6502/loadstor.c similarity index 100% rename from tests/mos6502.loadstor.c rename to tests/mos6502/loadstor.c diff --git a/tests/mos6502.c b/tests/mos6502/mos6502.c similarity index 100% rename from tests/mos6502.c rename to tests/mos6502/mos6502.c diff --git a/tests/mos6502.stat.c b/tests/mos6502/stat.c similarity index 100% rename from tests/mos6502.stat.c rename to tests/mos6502/stat.c