diff --git a/src/test/Makefile b/src/test/Makefile index 63c6d5fb5..77710cd3c 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1,6 +1,6 @@ TARGETSS := all verify clean cleanall cleanlift recompile json cleanjson cleangts gts -SUBTARGETS = $(wildcard correct/*/ incorrect/*/) +SUBTARGETS = $(wildcard correct/*/ incorrect/*/ correct_analyse/*/) .PHONY : $(TARGETSS) $(SUBTARGETS) correct incorrect $(TARGETSS): $(SUBTARGETS) diff --git a/src/test/correct/indirect_call/clang/indirect_call.adt b/src/test/correct_analyse/indirect_call/clang/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/clang/indirect_call.adt rename to src/test/correct_analyse/indirect_call/clang/indirect_call.adt diff --git a/src/test/correct/indirect_call/clang/indirect_call.bir b/src/test/correct_analyse/indirect_call/clang/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/clang/indirect_call.bir rename to src/test/correct_analyse/indirect_call/clang/indirect_call.bir diff --git a/src/test/correct/indirect_call/clang/indirect_call.gts b/src/test/correct_analyse/indirect_call/clang/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/clang/indirect_call.gts rename to src/test/correct_analyse/indirect_call/clang/indirect_call.gts diff --git a/src/test/correct/indirect_call/clang/indirect_call.relf b/src/test/correct_analyse/indirect_call/clang/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/clang/indirect_call.relf rename to src/test/correct_analyse/indirect_call/clang/indirect_call.relf diff --git a/src/test/correct/indirect_call/clang_O2/indirect_call.adt b/src/test/correct_analyse/indirect_call/clang_O2/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/clang_O2/indirect_call.adt rename to src/test/correct_analyse/indirect_call/clang_O2/indirect_call.adt diff --git a/src/test/correct/indirect_call/clang_O2/indirect_call.bir b/src/test/correct_analyse/indirect_call/clang_O2/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/clang_O2/indirect_call.bir rename to src/test/correct_analyse/indirect_call/clang_O2/indirect_call.bir diff --git a/src/test/correct/indirect_call/clang_O2/indirect_call.expected b/src/test/correct_analyse/indirect_call/clang_O2/indirect_call.expected similarity index 100% rename from src/test/correct/indirect_call/clang_O2/indirect_call.expected rename to src/test/correct_analyse/indirect_call/clang_O2/indirect_call.expected diff --git a/src/test/correct/indirect_call/clang_O2/indirect_call.gts b/src/test/correct_analyse/indirect_call/clang_O2/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/clang_O2/indirect_call.gts rename to src/test/correct_analyse/indirect_call/clang_O2/indirect_call.gts diff --git a/src/test/correct/indirect_call/clang_O2/indirect_call.relf b/src/test/correct_analyse/indirect_call/clang_O2/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/clang_O2/indirect_call.relf rename to src/test/correct_analyse/indirect_call/clang_O2/indirect_call.relf diff --git a/src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.adt b/src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.adt rename to src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.adt diff --git a/src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.bir b/src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.bir rename to src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.bir diff --git a/src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.gts b/src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.gts rename to src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.gts diff --git a/src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.relf b/src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/clang_no_plt_no_pic/indirect_call.relf rename to src/test/correct_analyse/indirect_call/clang_no_plt_no_pic/indirect_call.relf diff --git a/src/test/correct/indirect_call/clang_pic/indirect_call.adt b/src/test/correct_analyse/indirect_call/clang_pic/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/clang_pic/indirect_call.adt rename to src/test/correct_analyse/indirect_call/clang_pic/indirect_call.adt diff --git a/src/test/correct/indirect_call/clang_pic/indirect_call.bir b/src/test/correct_analyse/indirect_call/clang_pic/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/clang_pic/indirect_call.bir rename to src/test/correct_analyse/indirect_call/clang_pic/indirect_call.bir diff --git a/src/test/correct/indirect_call/clang_pic/indirect_call.gts b/src/test/correct_analyse/indirect_call/clang_pic/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/clang_pic/indirect_call.gts rename to src/test/correct_analyse/indirect_call/clang_pic/indirect_call.gts diff --git a/src/test/correct/indirect_call/clang_pic/indirect_call.relf b/src/test/correct_analyse/indirect_call/clang_pic/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/clang_pic/indirect_call.relf rename to src/test/correct_analyse/indirect_call/clang_pic/indirect_call.relf diff --git a/src/test/correct/indirect_call/gcc/indirect_call.adt b/src/test/correct_analyse/indirect_call/gcc/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/gcc/indirect_call.adt rename to src/test/correct_analyse/indirect_call/gcc/indirect_call.adt diff --git a/src/test/correct/indirect_call/gcc/indirect_call.bir b/src/test/correct_analyse/indirect_call/gcc/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/gcc/indirect_call.bir rename to src/test/correct_analyse/indirect_call/gcc/indirect_call.bir diff --git a/src/test/correct/indirect_call/gcc/indirect_call.gts b/src/test/correct_analyse/indirect_call/gcc/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/gcc/indirect_call.gts rename to src/test/correct_analyse/indirect_call/gcc/indirect_call.gts diff --git a/src/test/correct/indirect_call/gcc/indirect_call.relf b/src/test/correct_analyse/indirect_call/gcc/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/gcc/indirect_call.relf rename to src/test/correct_analyse/indirect_call/gcc/indirect_call.relf diff --git a/src/test/correct/indirect_call/gcc_O2/indirect_call.adt b/src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/gcc_O2/indirect_call.adt rename to src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.adt diff --git a/src/test/correct/indirect_call/gcc_O2/indirect_call.bir b/src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/gcc_O2/indirect_call.bir rename to src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.bir diff --git a/src/test/correct/indirect_call/gcc_O2/indirect_call.expected b/src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.expected similarity index 100% rename from src/test/correct/indirect_call/gcc_O2/indirect_call.expected rename to src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.expected diff --git a/src/test/correct/indirect_call/gcc_O2/indirect_call.gts b/src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/gcc_O2/indirect_call.gts rename to src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.gts diff --git a/src/test/correct/indirect_call/gcc_O2/indirect_call.relf b/src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/gcc_O2/indirect_call.relf rename to src/test/correct_analyse/indirect_call/gcc_O2/indirect_call.relf diff --git a/src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.adt b/src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.adt rename to src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.adt diff --git a/src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.bir b/src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.bir rename to src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.bir diff --git a/src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.gts b/src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.gts rename to src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.gts diff --git a/src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.relf b/src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/gcc_no_plt_no_pic/indirect_call.relf rename to src/test/correct_analyse/indirect_call/gcc_no_plt_no_pic/indirect_call.relf diff --git a/src/test/correct/indirect_call/gcc_pic/indirect_call.adt b/src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.adt similarity index 100% rename from src/test/correct/indirect_call/gcc_pic/indirect_call.adt rename to src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.adt diff --git a/src/test/correct/indirect_call/gcc_pic/indirect_call.bir b/src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.bir similarity index 100% rename from src/test/correct/indirect_call/gcc_pic/indirect_call.bir rename to src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.bir diff --git a/src/test/correct/indirect_call/gcc_pic/indirect_call.gts b/src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.gts similarity index 100% rename from src/test/correct/indirect_call/gcc_pic/indirect_call.gts rename to src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.gts diff --git a/src/test/correct/indirect_call/gcc_pic/indirect_call.relf b/src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.relf similarity index 100% rename from src/test/correct/indirect_call/gcc_pic/indirect_call.relf rename to src/test/correct_analyse/indirect_call/gcc_pic/indirect_call.relf diff --git a/src/test/correct/indirect_call/indirect_call.c b/src/test/correct_analyse/indirect_call/indirect_call.c similarity index 100% rename from src/test/correct/indirect_call/indirect_call.c rename to src/test/correct_analyse/indirect_call/indirect_call.c diff --git a/src/test/correct/jumptable/clang/jumptable.adt b/src/test/correct_analyse/jumptable/clang/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/clang/jumptable.adt rename to src/test/correct_analyse/jumptable/clang/jumptable.adt diff --git a/src/test/correct/jumptable/clang/jumptable.bir b/src/test/correct_analyse/jumptable/clang/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/clang/jumptable.bir rename to src/test/correct_analyse/jumptable/clang/jumptable.bir diff --git a/src/test/correct/jumptable/clang/jumptable.gts b/src/test/correct_analyse/jumptable/clang/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/clang/jumptable.gts rename to src/test/correct_analyse/jumptable/clang/jumptable.gts diff --git a/src/test/correct/jumptable/clang/jumptable.relf b/src/test/correct_analyse/jumptable/clang/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/clang/jumptable.relf rename to src/test/correct_analyse/jumptable/clang/jumptable.relf diff --git a/src/test/correct/jumptable/clang_O2/jumptable.adt b/src/test/correct_analyse/jumptable/clang_O2/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/clang_O2/jumptable.adt rename to src/test/correct_analyse/jumptable/clang_O2/jumptable.adt diff --git a/src/test/correct/jumptable/clang_O2/jumptable.bir b/src/test/correct_analyse/jumptable/clang_O2/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/clang_O2/jumptable.bir rename to src/test/correct_analyse/jumptable/clang_O2/jumptable.bir diff --git a/src/test/correct/jumptable/clang_O2/jumptable.expected b/src/test/correct_analyse/jumptable/clang_O2/jumptable.expected similarity index 100% rename from src/test/correct/jumptable/clang_O2/jumptable.expected rename to src/test/correct_analyse/jumptable/clang_O2/jumptable.expected diff --git a/src/test/correct/jumptable/clang_O2/jumptable.gts b/src/test/correct_analyse/jumptable/clang_O2/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/clang_O2/jumptable.gts rename to src/test/correct_analyse/jumptable/clang_O2/jumptable.gts diff --git a/src/test/correct/jumptable/clang_O2/jumptable.relf b/src/test/correct_analyse/jumptable/clang_O2/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/clang_O2/jumptable.relf rename to src/test/correct_analyse/jumptable/clang_O2/jumptable.relf diff --git a/src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.adt b/src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.adt rename to src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.adt diff --git a/src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.bir b/src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.bir rename to src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.bir diff --git a/src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.gts b/src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.gts rename to src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.gts diff --git a/src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.relf b/src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/clang_no_plt_no_pic/jumptable.relf rename to src/test/correct_analyse/jumptable/clang_no_plt_no_pic/jumptable.relf diff --git a/src/test/correct/jumptable/clang_pic/jumptable.adt b/src/test/correct_analyse/jumptable/clang_pic/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/clang_pic/jumptable.adt rename to src/test/correct_analyse/jumptable/clang_pic/jumptable.adt diff --git a/src/test/correct/jumptable/clang_pic/jumptable.bir b/src/test/correct_analyse/jumptable/clang_pic/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/clang_pic/jumptable.bir rename to src/test/correct_analyse/jumptable/clang_pic/jumptable.bir diff --git a/src/test/correct/jumptable/clang_pic/jumptable.gts b/src/test/correct_analyse/jumptable/clang_pic/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/clang_pic/jumptable.gts rename to src/test/correct_analyse/jumptable/clang_pic/jumptable.gts diff --git a/src/test/correct/jumptable/clang_pic/jumptable.relf b/src/test/correct_analyse/jumptable/clang_pic/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/clang_pic/jumptable.relf rename to src/test/correct_analyse/jumptable/clang_pic/jumptable.relf diff --git a/src/test/correct/jumptable/config.mk b/src/test/correct_analyse/jumptable/config.mk similarity index 100% rename from src/test/correct/jumptable/config.mk rename to src/test/correct_analyse/jumptable/config.mk diff --git a/src/test/correct/jumptable/gcc/jumptable.adt b/src/test/correct_analyse/jumptable/gcc/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/gcc/jumptable.adt rename to src/test/correct_analyse/jumptable/gcc/jumptable.adt diff --git a/src/test/correct/jumptable/gcc/jumptable.bir b/src/test/correct_analyse/jumptable/gcc/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/gcc/jumptable.bir rename to src/test/correct_analyse/jumptable/gcc/jumptable.bir diff --git a/src/test/correct/jumptable/gcc/jumptable.gts b/src/test/correct_analyse/jumptable/gcc/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/gcc/jumptable.gts rename to src/test/correct_analyse/jumptable/gcc/jumptable.gts diff --git a/src/test/correct/jumptable/gcc/jumptable.relf b/src/test/correct_analyse/jumptable/gcc/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/gcc/jumptable.relf rename to src/test/correct_analyse/jumptable/gcc/jumptable.relf diff --git a/src/test/correct/jumptable/gcc_O2/jumptable.adt b/src/test/correct_analyse/jumptable/gcc_O2/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/gcc_O2/jumptable.adt rename to src/test/correct_analyse/jumptable/gcc_O2/jumptable.adt diff --git a/src/test/correct/jumptable/gcc_O2/jumptable.bir b/src/test/correct_analyse/jumptable/gcc_O2/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/gcc_O2/jumptable.bir rename to src/test/correct_analyse/jumptable/gcc_O2/jumptable.bir diff --git a/src/test/correct/jumptable/gcc_O2/jumptable.expected b/src/test/correct_analyse/jumptable/gcc_O2/jumptable.expected similarity index 100% rename from src/test/correct/jumptable/gcc_O2/jumptable.expected rename to src/test/correct_analyse/jumptable/gcc_O2/jumptable.expected diff --git a/src/test/correct/jumptable/gcc_O2/jumptable.gts b/src/test/correct_analyse/jumptable/gcc_O2/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/gcc_O2/jumptable.gts rename to src/test/correct_analyse/jumptable/gcc_O2/jumptable.gts diff --git a/src/test/correct/jumptable/gcc_O2/jumptable.relf b/src/test/correct_analyse/jumptable/gcc_O2/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/gcc_O2/jumptable.relf rename to src/test/correct_analyse/jumptable/gcc_O2/jumptable.relf diff --git a/src/test/correct/jumptable/gcc_pic/jumptable.adt b/src/test/correct_analyse/jumptable/gcc_pic/jumptable.adt similarity index 100% rename from src/test/correct/jumptable/gcc_pic/jumptable.adt rename to src/test/correct_analyse/jumptable/gcc_pic/jumptable.adt diff --git a/src/test/correct/jumptable/gcc_pic/jumptable.bir b/src/test/correct_analyse/jumptable/gcc_pic/jumptable.bir similarity index 100% rename from src/test/correct/jumptable/gcc_pic/jumptable.bir rename to src/test/correct_analyse/jumptable/gcc_pic/jumptable.bir diff --git a/src/test/correct/jumptable/gcc_pic/jumptable.gts b/src/test/correct_analyse/jumptable/gcc_pic/jumptable.gts similarity index 100% rename from src/test/correct/jumptable/gcc_pic/jumptable.gts rename to src/test/correct_analyse/jumptable/gcc_pic/jumptable.gts diff --git a/src/test/correct/jumptable/gcc_pic/jumptable.relf b/src/test/correct_analyse/jumptable/gcc_pic/jumptable.relf similarity index 100% rename from src/test/correct/jumptable/gcc_pic/jumptable.relf rename to src/test/correct_analyse/jumptable/gcc_pic/jumptable.relf diff --git a/src/test/correct/jumptable/jumptable.c b/src/test/correct_analyse/jumptable/jumptable.c similarity index 100% rename from src/test/correct/jumptable/jumptable.c rename to src/test/correct_analyse/jumptable/jumptable.c diff --git a/src/test/correct/jumptable2/clang/jumptable2.adt b/src/test/correct_analyse/jumptable2/clang/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/clang/jumptable2.adt rename to src/test/correct_analyse/jumptable2/clang/jumptable2.adt diff --git a/src/test/correct/jumptable2/clang/jumptable2.bir b/src/test/correct_analyse/jumptable2/clang/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/clang/jumptable2.bir rename to src/test/correct_analyse/jumptable2/clang/jumptable2.bir diff --git a/src/test/correct/jumptable2/clang/jumptable2.gts b/src/test/correct_analyse/jumptable2/clang/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/clang/jumptable2.gts rename to src/test/correct_analyse/jumptable2/clang/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang/jumptable2.relf b/src/test/correct_analyse/jumptable2/clang/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/clang/jumptable2.relf rename to src/test/correct_analyse/jumptable2/clang/jumptable2.relf diff --git a/src/test/correct/jumptable2/clang_O2/jumptable2.adt b/src/test/correct_analyse/jumptable2/clang_O2/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/clang_O2/jumptable2.adt rename to src/test/correct_analyse/jumptable2/clang_O2/jumptable2.adt diff --git a/src/test/correct/jumptable2/clang_O2/jumptable2.bir b/src/test/correct_analyse/jumptable2/clang_O2/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/clang_O2/jumptable2.bir rename to src/test/correct_analyse/jumptable2/clang_O2/jumptable2.bir diff --git a/src/test/correct/jumptable2/clang_O2/jumptable2.gts b/src/test/correct_analyse/jumptable2/clang_O2/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/clang_O2/jumptable2.gts rename to src/test/correct_analyse/jumptable2/clang_O2/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang_O2/jumptable2.relf b/src/test/correct_analyse/jumptable2/clang_O2/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/clang_O2/jumptable2.relf rename to src/test/correct_analyse/jumptable2/clang_O2/jumptable2.relf diff --git a/src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.adt b/src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.adt rename to src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.adt diff --git a/src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.bir b/src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.bir rename to src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.bir diff --git a/src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.gts b/src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.gts rename to src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.relf b/src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/clang_no_plt_no_pic/jumptable2.relf rename to src/test/correct_analyse/jumptable2/clang_no_plt_no_pic/jumptable2.relf diff --git a/src/test/correct/jumptable2/clang_pic/jumptable2.adt b/src/test/correct_analyse/jumptable2/clang_pic/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/clang_pic/jumptable2.adt rename to src/test/correct_analyse/jumptable2/clang_pic/jumptable2.adt diff --git a/src/test/correct/jumptable2/clang_pic/jumptable2.bir b/src/test/correct_analyse/jumptable2/clang_pic/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/clang_pic/jumptable2.bir rename to src/test/correct_analyse/jumptable2/clang_pic/jumptable2.bir diff --git a/src/test/correct/jumptable2/clang_pic/jumptable2.gts b/src/test/correct_analyse/jumptable2/clang_pic/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/clang_pic/jumptable2.gts rename to src/test/correct_analyse/jumptable2/clang_pic/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang_pic/jumptable2.relf b/src/test/correct_analyse/jumptable2/clang_pic/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/clang_pic/jumptable2.relf rename to src/test/correct_analyse/jumptable2/clang_pic/jumptable2.relf diff --git a/src/test/correct/jumptable2/gcc/jumptable2.adt b/src/test/correct_analyse/jumptable2/gcc/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/gcc/jumptable2.adt rename to src/test/correct_analyse/jumptable2/gcc/jumptable2.adt diff --git a/src/test/correct/jumptable2/gcc/jumptable2.bir b/src/test/correct_analyse/jumptable2/gcc/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/gcc/jumptable2.bir rename to src/test/correct_analyse/jumptable2/gcc/jumptable2.bir diff --git a/src/test/correct/jumptable2/gcc/jumptable2.gts b/src/test/correct_analyse/jumptable2/gcc/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/gcc/jumptable2.gts rename to src/test/correct_analyse/jumptable2/gcc/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc/jumptable2.relf b/src/test/correct_analyse/jumptable2/gcc/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/gcc/jumptable2.relf rename to src/test/correct_analyse/jumptable2/gcc/jumptable2.relf diff --git a/src/test/correct/jumptable2/gcc_O2/jumptable2.adt b/src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/gcc_O2/jumptable2.adt rename to src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.adt diff --git a/src/test/correct/jumptable2/gcc_O2/jumptable2.bir b/src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/gcc_O2/jumptable2.bir rename to src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.bir diff --git a/src/test/correct/jumptable2/gcc_O2/jumptable2.gts b/src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/gcc_O2/jumptable2.gts rename to src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc_O2/jumptable2.relf b/src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/gcc_O2/jumptable2.relf rename to src/test/correct_analyse/jumptable2/gcc_O2/jumptable2.relf diff --git a/src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.adt b/src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.adt rename to src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.adt diff --git a/src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.bir b/src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.bir rename to src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.bir diff --git a/src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.gts b/src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.gts rename to src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.relf b/src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/gcc_no_plt_no_pic/jumptable2.relf rename to src/test/correct_analyse/jumptable2/gcc_no_plt_no_pic/jumptable2.relf diff --git a/src/test/correct/jumptable2/gcc_pic/jumptable2.adt b/src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.adt similarity index 100% rename from src/test/correct/jumptable2/gcc_pic/jumptable2.adt rename to src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.adt diff --git a/src/test/correct/jumptable2/gcc_pic/jumptable2.bir b/src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.bir similarity index 100% rename from src/test/correct/jumptable2/gcc_pic/jumptable2.bir rename to src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.bir diff --git a/src/test/correct/jumptable2/gcc_pic/jumptable2.gts b/src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.gts similarity index 100% rename from src/test/correct/jumptable2/gcc_pic/jumptable2.gts rename to src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc_pic/jumptable2.relf b/src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.relf similarity index 100% rename from src/test/correct/jumptable2/gcc_pic/jumptable2.relf rename to src/test/correct_analyse/jumptable2/gcc_pic/jumptable2.relf diff --git a/src/test/correct/jumptable2/jumptable2.c b/src/test/correct_analyse/jumptable2/jumptable2.c similarity index 100% rename from src/test/correct/jumptable2/jumptable2.c rename to src/test/correct_analyse/jumptable2/jumptable2.c diff --git a/src/test/correct/jumptable3/clang/jumptable3.adt b/src/test/correct_analyse/jumptable3/clang/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/clang/jumptable3.adt rename to src/test/correct_analyse/jumptable3/clang/jumptable3.adt diff --git a/src/test/correct/jumptable3/clang/jumptable3.bir b/src/test/correct_analyse/jumptable3/clang/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/clang/jumptable3.bir rename to src/test/correct_analyse/jumptable3/clang/jumptable3.bir diff --git a/src/test/correct/jumptable3/clang/jumptable3.gts b/src/test/correct_analyse/jumptable3/clang/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/clang/jumptable3.gts rename to src/test/correct_analyse/jumptable3/clang/jumptable3.gts diff --git a/src/test/correct/jumptable3/clang/jumptable3.relf b/src/test/correct_analyse/jumptable3/clang/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/clang/jumptable3.relf rename to src/test/correct_analyse/jumptable3/clang/jumptable3.relf diff --git a/src/test/correct/jumptable3/clang_O2/jumptable3.adt b/src/test/correct_analyse/jumptable3/clang_O2/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/clang_O2/jumptable3.adt rename to src/test/correct_analyse/jumptable3/clang_O2/jumptable3.adt diff --git a/src/test/correct/jumptable3/clang_O2/jumptable3.bir b/src/test/correct_analyse/jumptable3/clang_O2/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/clang_O2/jumptable3.bir rename to src/test/correct_analyse/jumptable3/clang_O2/jumptable3.bir diff --git a/src/test/correct/jumptable3/clang_O2/jumptable3.gts b/src/test/correct_analyse/jumptable3/clang_O2/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/clang_O2/jumptable3.gts rename to src/test/correct_analyse/jumptable3/clang_O2/jumptable3.gts diff --git a/src/test/correct/jumptable3/clang_O2/jumptable3.relf b/src/test/correct_analyse/jumptable3/clang_O2/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/clang_O2/jumptable3.relf rename to src/test/correct_analyse/jumptable3/clang_O2/jumptable3.relf diff --git a/src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.adt b/src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.adt rename to src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.adt diff --git a/src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.bir b/src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.bir rename to src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.bir diff --git a/src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.gts b/src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.gts rename to src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.gts diff --git a/src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.relf b/src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/clang_no_plt_no_pic/jumptable3.relf rename to src/test/correct_analyse/jumptable3/clang_no_plt_no_pic/jumptable3.relf diff --git a/src/test/correct/jumptable3/clang_pic/jumptable3.adt b/src/test/correct_analyse/jumptable3/clang_pic/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/clang_pic/jumptable3.adt rename to src/test/correct_analyse/jumptable3/clang_pic/jumptable3.adt diff --git a/src/test/correct/jumptable3/clang_pic/jumptable3.bir b/src/test/correct_analyse/jumptable3/clang_pic/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/clang_pic/jumptable3.bir rename to src/test/correct_analyse/jumptable3/clang_pic/jumptable3.bir diff --git a/src/test/correct/jumptable3/clang_pic/jumptable3.gts b/src/test/correct_analyse/jumptable3/clang_pic/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/clang_pic/jumptable3.gts rename to src/test/correct_analyse/jumptable3/clang_pic/jumptable3.gts diff --git a/src/test/correct/jumptable3/clang_pic/jumptable3.relf b/src/test/correct_analyse/jumptable3/clang_pic/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/clang_pic/jumptable3.relf rename to src/test/correct_analyse/jumptable3/clang_pic/jumptable3.relf diff --git a/src/test/correct/jumptable3/gcc/jumptable3.adt b/src/test/correct_analyse/jumptable3/gcc/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/gcc/jumptable3.adt rename to src/test/correct_analyse/jumptable3/gcc/jumptable3.adt diff --git a/src/test/correct/jumptable3/gcc/jumptable3.bir b/src/test/correct_analyse/jumptable3/gcc/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/gcc/jumptable3.bir rename to src/test/correct_analyse/jumptable3/gcc/jumptable3.bir diff --git a/src/test/correct/jumptable3/gcc/jumptable3.expected b/src/test/correct_analyse/jumptable3/gcc/jumptable3.expected similarity index 100% rename from src/test/correct/jumptable3/gcc/jumptable3.expected rename to src/test/correct_analyse/jumptable3/gcc/jumptable3.expected diff --git a/src/test/correct/jumptable3/gcc/jumptable3.gts b/src/test/correct_analyse/jumptable3/gcc/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/gcc/jumptable3.gts rename to src/test/correct_analyse/jumptable3/gcc/jumptable3.gts diff --git a/src/test/correct/jumptable3/gcc/jumptable3.relf b/src/test/correct_analyse/jumptable3/gcc/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/gcc/jumptable3.relf rename to src/test/correct_analyse/jumptable3/gcc/jumptable3.relf diff --git a/src/test/correct/jumptable3/gcc_O2/jumptable3.adt b/src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/gcc_O2/jumptable3.adt rename to src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.adt diff --git a/src/test/correct/jumptable3/gcc_O2/jumptable3.bir b/src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/gcc_O2/jumptable3.bir rename to src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.bir diff --git a/src/test/correct/jumptable3/gcc_O2/jumptable3.expected b/src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.expected similarity index 100% rename from src/test/correct/jumptable3/gcc_O2/jumptable3.expected rename to src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.expected diff --git a/src/test/correct/jumptable3/gcc_O2/jumptable3.gts b/src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/gcc_O2/jumptable3.gts rename to src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.gts diff --git a/src/test/correct/jumptable3/gcc_O2/jumptable3.relf b/src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/gcc_O2/jumptable3.relf rename to src/test/correct_analyse/jumptable3/gcc_O2/jumptable3.relf diff --git a/src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.adt b/src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.adt rename to src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.adt diff --git a/src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.bir b/src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.bir rename to src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.bir diff --git a/src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.expected b/src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.expected similarity index 100% rename from src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.expected rename to src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.expected diff --git a/src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.gts b/src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.gts rename to src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.gts diff --git a/src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.relf b/src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/gcc_no_plt_no_pic/jumptable3.relf rename to src/test/correct_analyse/jumptable3/gcc_no_plt_no_pic/jumptable3.relf diff --git a/src/test/correct/jumptable3/gcc_pic/jumptable3.adt b/src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.adt similarity index 100% rename from src/test/correct/jumptable3/gcc_pic/jumptable3.adt rename to src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.adt diff --git a/src/test/correct/jumptable3/gcc_pic/jumptable3.bir b/src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.bir similarity index 100% rename from src/test/correct/jumptable3/gcc_pic/jumptable3.bir rename to src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.bir diff --git a/src/test/correct/jumptable3/gcc_pic/jumptable3.expected b/src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.expected similarity index 100% rename from src/test/correct/jumptable3/gcc_pic/jumptable3.expected rename to src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.expected diff --git a/src/test/correct/jumptable3/gcc_pic/jumptable3.gts b/src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.gts similarity index 100% rename from src/test/correct/jumptable3/gcc_pic/jumptable3.gts rename to src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.gts diff --git a/src/test/correct/jumptable3/gcc_pic/jumptable3.relf b/src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.relf similarity index 100% rename from src/test/correct/jumptable3/gcc_pic/jumptable3.relf rename to src/test/correct_analyse/jumptable3/gcc_pic/jumptable3.relf diff --git a/src/test/correct/jumptable3/jumptable3.c b/src/test/correct_analyse/jumptable3/jumptable3.c similarity index 100% rename from src/test/correct/jumptable3/jumptable3.c rename to src/test/correct_analyse/jumptable3/jumptable3.c diff --git a/src/test/correct/jumptable3/jumptable3.spec b/src/test/correct_analyse/jumptable3/jumptable3.spec similarity index 100% rename from src/test/correct/jumptable3/jumptable3.spec rename to src/test/correct_analyse/jumptable3/jumptable3.spec diff --git a/src/test/scala/SystemTests.scala b/src/test/scala/SystemTests.scala index 8e66c919c..cbe6155b1 100644 --- a/src/test/scala/SystemTests.scala +++ b/src/test/scala/SystemTests.scala @@ -14,6 +14,9 @@ import scala.sys.process.* trait SystemTests extends AnyFunSuite { val testPath = "./src/test/" val correctPath = "./src/test/correct" + val correctAnalysePath = "./src/test/correct_analyse/" + val correctAnalysePrograms: Array[String] = getSubdirectories(correctAnalysePath) + val correctPrograms: Array[String] = getSubdirectories(correctPath) val incorrectPath = "./src/test/incorrect" val incorrectPrograms: Array[String] = getSubdirectories(incorrectPath) @@ -28,20 +31,21 @@ trait SystemTests extends AnyFunSuite { val testResults: mutable.ArrayBuffer[(String, TestResult)] = mutable.ArrayBuffer() - def runTests(programs: Array[String], path: String, name: String, shouldVerify: Boolean, useADT: Boolean): Unit = { + def runTests(programs: Array[String], path: String, name: String, shouldVerify: Boolean, useADT: Boolean, analyse:Boolean): Unit = { + val adt = if useADT then ":BAP" else ":GTIRB" // get all variations of each program for (p <- programs) { val programPath = path + "/" + p val variations = getSubdirectories(programPath) variations.foreach(t => - test(name + "/" + p + "/" + t) { - runTest(path, p, t, shouldVerify, useADT) + test(name + "/" + p + "/" + t + adt) { + runTest(path, p, t, shouldVerify, useADT, analyse) } ) } } - def summary(): Unit = { + def summary(name:String): Unit = { val csv: String = "testCase," + TestResult.csvHeader + System.lineSeparator() + testResults.map(r => s"${r._1},${r._2.toCsv}").mkString(System.lineSeparator()) log(csv, testPath + "testResults.csv") @@ -61,10 +65,10 @@ trait SystemTests extends AnyFunSuite { val summaryHeader = "passedCount,failedCount,verifiedCount,counterexampleCount,timeoutCount,verifyTotalTime,counterexampleTotalTime" val summaryRow = s"$numSuccess,$numFail,$numVerified,${counterExamples.size},$numTimeout,${verifying.sum},${counterExamples.sum}" - log(summaryHeader + System.lineSeparator() + summaryRow, testPath + "summary.csv") + log(summaryHeader + System.lineSeparator() + summaryRow, name + testPath + "summary.csv") } - def runTest(path: String, name: String, variation: String, shouldVerify: Boolean, useADT: Boolean): Unit = { + def runTest(path: String, name: String, variation: String, shouldVerify: Boolean, useADT: Boolean, analyse: Boolean): Unit = { val directoryPath = path + "/" + name + "/" val variationPath = directoryPath + variation + "/" + name val specPath = directoryPath + name + ".spec" @@ -76,6 +80,7 @@ trait SystemTests extends AnyFunSuite { val args = mutable.ArrayBuffer("--input", inputPath, "--relf", RELFPath, "--output", outPath) if (File(specPath).exists) args ++= Seq("--spec", specPath) + if (analyse) args ++= Seq("--analyse") Main.main(args.toArray) val translateTime = timer.checkPoint("translate-boogie") @@ -161,17 +166,21 @@ trait SystemTests extends AnyFunSuite { } class SystemTestsBAP extends SystemTests { - runTests(correctPrograms, correctPath, "correct", true, true) - runTests(incorrectPrograms, incorrectPath, "incorrect", false, true) - test("summary") { - summary() + runTests(correctPrograms, correctPath, "correct", true, true, false) + runTests(incorrectPrograms, incorrectPath, "incorrect", false, true, false) + runTests(correctAnalysePrograms, correctAnalysePath, "correct_analyse", true, true, true) + test("summary-bap") { + summary("bap-") } } class SystemTestsGTIRB extends SystemTests { - runTests(correctPrograms, correctPath, "correct", true, false) - runTests(incorrectPrograms, incorrectPath, "incorrect", false, false) - test("summary") { - summary() + runTests(correctPrograms, correctPath, "correct", true, false, false) + runTests(incorrectPrograms, incorrectPath, "incorrect", false, false, false) + runTests(correctAnalysePrograms, correctAnalysePath, "correct_analyse", true, false, true) + test("summary-gtirb") { + summary("gtirb-") } } + +