Some tests are currently failing, so they are commented. To be investigated.
qemu:or1k-linux-user-test_addc FAIL 0.05s (exit status 255 or 0xff) qemu:or1k-linux-user-test_div FAIL 0.06s (exit status 136 or signal 8 SIGFPE) qemu:or1k-linux-user-test_extx FAIL 0.06s (exit status 132 or signal 4 SIGILL) qemu:or1k-linux-user-test_lx FAIL 0.05s (exit status 139 or signal 11 SIGSEGV) Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/meson.build | 1 + tests/tcg/or1k/Makefile | 71 ------------------------------------- tests/tcg/or1k/meson.build | 72 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 71 deletions(-) delete mode 100644 tests/tcg/or1k/Makefile create mode 100644 tests/tcg/or1k/meson.build diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 598b32ea1b4..0dbf92c2d9c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -145,6 +145,7 @@ subdir('m68k') subdir('mips') subdir('mips64') subdir('mips64el') +subdir('or1k') image_targets = {} exe_targets = [] diff --git a/tests/tcg/or1k/Makefile b/tests/tcg/or1k/Makefile deleted file mode 100644 index fb5ceda512f..00000000000 --- a/tests/tcg/or1k/Makefile +++ /dev/null @@ -1,71 +0,0 @@ --include ../../config-host.mak - -CROSS = or1k-linux- - -SIM = qemu-or1k - -CC = $(CROSS)gcc - -TESTCASES = test_add.tst -TESTCASES += test_sub.tst -TESTCASES += test_addc.tst -TESTCASES += test_addi.tst -TESTCASES += test_addic.tst -TESTCASES += test_and_or.tst -TESTCASES += test_bf.tst -TESTCASES += test_bnf.tst -TESTCASES += test_div.tst -TESTCASES += test_divu.tst -TESTCASES += test_extx.tst -TESTCASES += test_fx.tst -TESTCASES += test_jal.tst -TESTCASES += test_j.tst -TESTCASES += test_lf_div.tst -TESTCASES += test_lf_eqs.tst -TESTCASES += test_lf_ges.tst -TESTCASES += test_lf_gts.tst -TESTCASES += test_lf_les.tst -TESTCASES += test_lf_lts.tst -TESTCASES += test_lf_mul.tst -TESTCASES += test_lf_nes.tst -TESTCASES += test_lf_rem.tst -TESTCASES += test_lf_sub.tst -TESTCASES += test_lf_add.tst -TESTCASES += test_logic.tst -TESTCASES += test_lx.tst -TESTCASES += test_movhi.tst -TESTCASES += test_mul.tst -TESTCASES += test_mulu.tst -TESTCASES += test_muli.tst -TESTCASES += test_sfeq.tst -TESTCASES += test_sfeqi.tst -TESTCASES += test_sfges.tst -TESTCASES += test_sfgesi.tst -TESTCASES += test_sfgeu.tst -TESTCASES += test_sfgeui.tst -TESTCASES += test_sfgts.tst -TESTCASES += test_sfgtsi.tst -TESTCASES += test_sfgtu.tst -TESTCASES += test_sfgtui.tst -TESTCASES += test_sfles.tst -TESTCASES += test_sflesi.tst -TESTCASES += test_sfleu.tst -TESTCASES += test_sfleui.tst -TESTCASES += test_sflts.tst -TESTCASES += test_sfltsi.tst -TESTCASES += test_sfltu.tst -TESTCASES += test_sfltui.tst -TESTCASES += test_sfne.tst -TESTCASES += test_sfnei.tst - -all: $(TESTCASES) - -%.tst: %.c - $(CC) -static $< -o $@ - - -check: $(TESTCASES) - @for case in $(TESTCASES); do $(SIM) $$case; echo $$case pass!; sleep 0.2; done - -clean: - $(RM) -rf $(TESTCASES) diff --git a/tests/tcg/or1k/meson.build b/tests/tcg/or1k/meson.build new file mode 100644 index 00000000000..5151e8f361f --- /dev/null +++ b/tests/tcg/or1k/meson.build @@ -0,0 +1,72 @@ +tests = [] + +tests += tcg_tests['multiarch-linux-user']['tests'] + +tests += { + 'test_add.c': {}, + #'test_addc.c': {}, + 'test_addi.c': {}, + 'test_addic.c': {}, + 'test_and_or.c': {}, + 'test_bf.c': {}, + 'test_bnf.c': {}, + #'test_div.c': {}, + 'test_divu.c': {}, + #'test_extx.c': {}, + 'test_fx.c': {}, + 'test_j.c': {}, + 'test_jal.c': {}, + 'test_lf_add.c': {}, + 'test_lf_div.c': {}, + 'test_lf_eqs.c': {}, + 'test_lf_ges.c': {}, + 'test_lf_gts.c': {}, + 'test_lf_les.c': {}, + 'test_lf_lts.c': {}, + 'test_lf_mul.c': {}, + 'test_lf_nes.c': {}, + 'test_lf_rem.c': {}, + 'test_lf_sub.c': {}, + 'test_logic.c': {}, + #'test_lx.c': {}, + 'test_movhi.c': {}, + 'test_mul.c': {}, + 'test_muli.c': {}, + 'test_mulu.c': {}, + 'test_sfeq.c': {}, + 'test_sfeqi.c': {}, + 'test_sfges.c': {}, + 'test_sfgesi.c': {}, + 'test_sfgeu.c': {}, + 'test_sfgeui.c': {}, + 'test_sfgts.c': {}, + 'test_sfgtsi.c': {}, + 'test_sfgtu.c': {}, + 'test_sfgtui.c': {}, + 'test_sfles.c': {}, + 'test_sflesi.c': {}, + 'test_sfleu.c': {}, + 'test_sfleui.c': {}, + 'test_sflts.c': {}, + 'test_sfltsi.c': {}, + 'test_sfltu.c': {}, + 'test_sfltui.c': {}, + 'test_sfne.c': {}, + 'test_sfnei.c': {}, + 'test_sub.c': {}, +} + +if 'qemu-or1k' in emulators + tcg_tests += { + 'or1k-linux-user': { + 'cc': 'or1k-none-linux-musl-gcc', + 'cc_dockerfile': 'debian-all-test-cross', + 'cc_docker_host_arch': ['x86_64'], + 'cc_feat_cflags': cc_feat_cflags, + 'folder': 'or1k', + 'gdb_arch': 'or1k', + 'qemu': emulators['qemu-or1k'], + 'tests': tests, + } + } +endif -- 2.47.3
