diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 59a8dd7481..ef3310b507 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -142,12 +142,6 @@ jobs: mkdir -p deb mv *.deb *.ddeb deb - - name: Test - run: | - pushd src/build - ./pyvenv/bin/meson compile test-xbox - ./pyvenv/bin/meson test --suite xbox --no-rebuild - popd - name: Report ccache stats run: ccache -s - name: Generate AppImage diff --git a/tests/meson.build b/tests/meson.build index d389182aba..cbe7916241 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -89,4 +89,3 @@ subdir('qtest') subdir('migration-stress') subdir('functional') subdir('tracetool') -subdir('xbox') diff --git a/tests/xbox/dsp/data/Makefile b/tests/xbox/dsp/data/Makefile deleted file mode 100644 index 8bd271a422..0000000000 --- a/tests/xbox/dsp/data/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: basic - -%: %.a56 - a56 -o $@ $< diff --git a/tests/xbox/dsp/data/basic b/tests/xbox/dsp/data/basic deleted file mode 100644 index 7b11e507ea..0000000000 --- a/tests/xbox/dsp/data/basic +++ /dev/null @@ -1,12 +0,0 @@ -P 0000 0C0040 -P 0040 0AF080 -P 0041 000042 -P 0042 56F400 -P 0043 123456 -P 0044 567000 -P 0045 000003 -P 0046 08F484 -P 0047 000001 -P 0048 0C0042 -I 000040 start -I 000042 mainloop diff --git a/tests/xbox/dsp/data/basic.a56 b/tests/xbox/dsp/data/basic.a56 deleted file mode 100644 index 0be7483dba..0000000000 --- a/tests/xbox/dsp/data/basic.a56 +++ /dev/null @@ -1,12 +0,0 @@ - org p:$0000 - jmp . - */ - -#include "qemu/osdep.h" -#include "hw/xbox/mcpx/apu/dsp/dsp.h" - -static void scratch_rw(void *opaque, uint8_t *ptr, uint32_t addr, size_t len, bool dir) -{ - assert(!"Not implemented"); -} - -static void fifo_rw(void *opaque, uint8_t *ptr, unsigned int index, size_t len, bool dir) -{ - assert(!"Not implemented"); -} - -static void load_prog(DSPState *s, const char *path) -{ - FILE *file = fopen(path, "r"); - assert(file && "Error opening file"); - - char type, line[100], arg1[20], arg2[20]; - int addr, value; - - while (fgets(line, sizeof(line), file)) { - if (sscanf(line, "%c %s %s", &type, arg1, arg2) >= 2) { - switch (type) { - case 'P': - case 'X': - case 'Y': { - assert(sscanf(arg1, "%x", &addr) == 1); - assert(sscanf(arg2, "%x", &value) == 1); - dsp_write_memory(s, type, addr, value); - break; - } - } - } else { - printf("Invalid line: %s\n", line); - assert(0); - } - } - - fclose(file); -} - -static void test_dsp_basic(void) -{ - g_autofree gchar *path = g_test_build_filename(G_TEST_DIST, "data", "basic", NULL); - - DSPState *s = dsp_init(NULL, scratch_rw, fifo_rw); - - load_prog(s, path); - dsp_run(s, 1000); - - uint32_t v = dsp_read_memory(s, 'X', 3); - g_assert_cmphex(v, ==, 0x123456); - - dsp_destroy(s); -} - -int main(int argc, char **argv) -{ - g_test_init(&argc, &argv, NULL); - - g_test_add_func("/basic", test_dsp_basic); - - return g_test_run(); -} diff --git a/tests/xbox/meson.build b/tests/xbox/meson.build deleted file mode 100644 index e836218210..0000000000 --- a/tests/xbox/meson.build +++ /dev/null @@ -1 +0,0 @@ -subdir('dsp')