From 0ed4ed0974f6058693261583802eff42f48ab653 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 19 May 2021 09:59:46 +0100 Subject: [PATCH 1/4] In preparation for adding unit tests, move xmostest-based legacy tests into a legacy_tests sub-directory of the tests directory --- Jenkinsfile | 4 ++-- tests/{ => legacy_tests}/app_test_i2s_loopback/Makefile | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/debug_conf.h | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/main.xc | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/simulation.xc | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/usb_device.h | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/usb_device.xc | 0 .../app_test_i2s_loopback/xk_216_mc/audiohw.xc | 0 .../app_test_i2s_loopback/xk_216_mc/cs2100.h | 0 .../app_test_i2s_loopback/xk_216_mc/cs4384.h | 0 .../app_test_i2s_loopback/xk_216_mc/cs5368.h | 0 .../app_test_i2s_loopback/xk_216_mc/gpio_access.c | 0 .../app_test_i2s_loopback/xk_216_mc/gpio_access.h | 0 .../app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn | 0 tests/{ => legacy_tests}/app_test_i2s_loopback/xua_conf.h | 0 tests/{ => legacy_tests}/pass.expect | 0 tests/{ => legacy_tests}/runtests.py | 0 tests/{ => legacy_tests}/test_i2s_loopback.py | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename tests/{ => legacy_tests}/app_test_i2s_loopback/Makefile (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/debug_conf.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/main.xc (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/simulation.xc (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/usb_device.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/usb_device.xc (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/audiohw.xc (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs2100.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs4384.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs5368.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/gpio_access.c (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/gpio_access.h (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn (100%) rename tests/{ => legacy_tests}/app_test_i2s_loopback/xua_conf.h (100%) rename tests/{ => legacy_tests}/pass.expect (100%) rename tests/{ => legacy_tests}/runtests.py (100%) rename tests/{ => legacy_tests}/test_i2s_loopback.py (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 092948c7..a356c9a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,9 +27,9 @@ pipeline { xcoreLibraryChecks("${REPO}") } } - stage('Tests') { + stage('Legacy tests') { steps { - runXmostest("${REPO}", 'tests') + runXmostest("${REPO}", 'tests/legacy_tests') } } stage('xCORE builds') { diff --git a/tests/app_test_i2s_loopback/Makefile b/tests/legacy_tests/app_test_i2s_loopback/Makefile similarity index 100% rename from tests/app_test_i2s_loopback/Makefile rename to tests/legacy_tests/app_test_i2s_loopback/Makefile diff --git a/tests/app_test_i2s_loopback/debug_conf.h b/tests/legacy_tests/app_test_i2s_loopback/debug_conf.h similarity index 100% rename from tests/app_test_i2s_loopback/debug_conf.h rename to tests/legacy_tests/app_test_i2s_loopback/debug_conf.h diff --git a/tests/app_test_i2s_loopback/main.xc b/tests/legacy_tests/app_test_i2s_loopback/main.xc similarity index 100% rename from tests/app_test_i2s_loopback/main.xc rename to tests/legacy_tests/app_test_i2s_loopback/main.xc diff --git a/tests/app_test_i2s_loopback/simulation.xc b/tests/legacy_tests/app_test_i2s_loopback/simulation.xc similarity index 100% rename from tests/app_test_i2s_loopback/simulation.xc rename to tests/legacy_tests/app_test_i2s_loopback/simulation.xc diff --git a/tests/app_test_i2s_loopback/usb_device.h b/tests/legacy_tests/app_test_i2s_loopback/usb_device.h similarity index 100% rename from tests/app_test_i2s_loopback/usb_device.h rename to tests/legacy_tests/app_test_i2s_loopback/usb_device.h diff --git a/tests/app_test_i2s_loopback/usb_device.xc b/tests/legacy_tests/app_test_i2s_loopback/usb_device.xc similarity index 100% rename from tests/app_test_i2s_loopback/usb_device.xc rename to tests/legacy_tests/app_test_i2s_loopback/usb_device.xc diff --git a/tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs2100.h b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/cs2100.h rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs4384.h b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/cs4384.h rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs5368.h b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/cs5368.h rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h diff --git a/tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c diff --git a/tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h diff --git a/tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn b/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn similarity index 100% rename from tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn rename to tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn diff --git a/tests/app_test_i2s_loopback/xua_conf.h b/tests/legacy_tests/app_test_i2s_loopback/xua_conf.h similarity index 100% rename from tests/app_test_i2s_loopback/xua_conf.h rename to tests/legacy_tests/app_test_i2s_loopback/xua_conf.h diff --git a/tests/pass.expect b/tests/legacy_tests/pass.expect similarity index 100% rename from tests/pass.expect rename to tests/legacy_tests/pass.expect diff --git a/tests/runtests.py b/tests/legacy_tests/runtests.py similarity index 100% rename from tests/runtests.py rename to tests/legacy_tests/runtests.py diff --git a/tests/test_i2s_loopback.py b/tests/legacy_tests/test_i2s_loopback.py similarity index 100% rename from tests/test_i2s_loopback.py rename to tests/legacy_tests/test_i2s_loopback.py From e6c8766bb7be88bb923055a4acfe6b7f9dd80654 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 19 May 2021 10:10:51 +0100 Subject: [PATCH 2/4] Update change log --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a5db13c9..75a5e377 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ lib_xua Change Log ----- * CHANGED: Move HID descriptors to ease maintenance + * CHANGED: Move legacy tests to separate directory 1.2.0 ----- From f66ddc53ebea1252e394fc11e959b9be43026ab6 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 19 May 2021 10:55:33 +0100 Subject: [PATCH 3/4] Move legacy tests one level up in the directory hierarchy --- Jenkinsfile | 2 +- .../app_test_i2s_loopback/Makefile | 0 .../app_test_i2s_loopback/debug_conf.h | 0 .../legacy_tests => legacy_tests}/app_test_i2s_loopback/main.xc | 0 .../app_test_i2s_loopback/simulation.xc | 0 .../app_test_i2s_loopback/usb_device.h | 0 .../app_test_i2s_loopback/usb_device.xc | 0 .../app_test_i2s_loopback/xk_216_mc/audiohw.xc | 0 .../app_test_i2s_loopback/xk_216_mc/cs2100.h | 0 .../app_test_i2s_loopback/xk_216_mc/cs4384.h | 0 .../app_test_i2s_loopback/xk_216_mc/cs5368.h | 0 .../app_test_i2s_loopback/xk_216_mc/gpio_access.c | 0 .../app_test_i2s_loopback/xk_216_mc/gpio_access.h | 0 .../app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn | 0 .../app_test_i2s_loopback/xua_conf.h | 0 {tests/legacy_tests => legacy_tests}/pass.expect | 0 {tests/legacy_tests => legacy_tests}/runtests.py | 0 {tests/legacy_tests => legacy_tests}/test_i2s_loopback.py | 0 18 files changed, 1 insertion(+), 1 deletion(-) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/Makefile (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/debug_conf.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/main.xc (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/simulation.xc (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/usb_device.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/usb_device.xc (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/audiohw.xc (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs2100.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs4384.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/cs5368.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/gpio_access.c (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/gpio_access.h (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn (100%) rename {tests/legacy_tests => legacy_tests}/app_test_i2s_loopback/xua_conf.h (100%) rename {tests/legacy_tests => legacy_tests}/pass.expect (100%) rename {tests/legacy_tests => legacy_tests}/runtests.py (100%) rename {tests/legacy_tests => legacy_tests}/test_i2s_loopback.py (100%) diff --git a/Jenkinsfile b/Jenkinsfile index a356c9a3..2b4ae54d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } stage('Legacy tests') { steps { - runXmostest("${REPO}", 'tests/legacy_tests') + runXmostest("${REPO}", 'legacy_tests') } } stage('xCORE builds') { diff --git a/tests/legacy_tests/app_test_i2s_loopback/Makefile b/legacy_tests/app_test_i2s_loopback/Makefile similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/Makefile rename to legacy_tests/app_test_i2s_loopback/Makefile diff --git a/tests/legacy_tests/app_test_i2s_loopback/debug_conf.h b/legacy_tests/app_test_i2s_loopback/debug_conf.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/debug_conf.h rename to legacy_tests/app_test_i2s_loopback/debug_conf.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/main.xc b/legacy_tests/app_test_i2s_loopback/main.xc similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/main.xc rename to legacy_tests/app_test_i2s_loopback/main.xc diff --git a/tests/legacy_tests/app_test_i2s_loopback/simulation.xc b/legacy_tests/app_test_i2s_loopback/simulation.xc similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/simulation.xc rename to legacy_tests/app_test_i2s_loopback/simulation.xc diff --git a/tests/legacy_tests/app_test_i2s_loopback/usb_device.h b/legacy_tests/app_test_i2s_loopback/usb_device.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/usb_device.h rename to legacy_tests/app_test_i2s_loopback/usb_device.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/usb_device.xc b/legacy_tests/app_test_i2s_loopback/usb_device.xc similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/usb_device.xc rename to legacy_tests/app_test_i2s_loopback/usb_device.xc diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc b/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c b/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h diff --git a/tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn b/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn diff --git a/tests/legacy_tests/app_test_i2s_loopback/xua_conf.h b/legacy_tests/app_test_i2s_loopback/xua_conf.h similarity index 100% rename from tests/legacy_tests/app_test_i2s_loopback/xua_conf.h rename to legacy_tests/app_test_i2s_loopback/xua_conf.h diff --git a/tests/legacy_tests/pass.expect b/legacy_tests/pass.expect similarity index 100% rename from tests/legacy_tests/pass.expect rename to legacy_tests/pass.expect diff --git a/tests/legacy_tests/runtests.py b/legacy_tests/runtests.py similarity index 100% rename from tests/legacy_tests/runtests.py rename to legacy_tests/runtests.py diff --git a/tests/legacy_tests/test_i2s_loopback.py b/legacy_tests/test_i2s_loopback.py similarity index 100% rename from tests/legacy_tests/test_i2s_loopback.py rename to legacy_tests/test_i2s_loopback.py From 294d3a469e6048b87b4c86acf20d800f1041d2b5 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 19 May 2021 13:45:04 +0100 Subject: [PATCH 4/4] Set up for parallel testing --- Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b4ae54d..ef501285 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,9 +27,14 @@ pipeline { xcoreLibraryChecks("${REPO}") } } - stage('Legacy tests') { - steps { - runXmostest("${REPO}", 'legacy_tests') + stage('Tests') { + failFast true + parallel { + stage('Legacy tests') { + steps { + runXmostest("${REPO}", 'legacy_tests') + } + } } } stage('xCORE builds') {