diff --git a/Kconfig b/Kconfig index c16817583a5..a7a7758f671 100644 --- a/Kconfig +++ b/Kconfig @@ -1,4 +1,4 @@ rsource "src/Kconfig" rsource "libcpu/Kconfig" rsource "components/Kconfig" -rsource "examples/utest/testcases/Kconfig" +rsource "Kconfig.utestcases" diff --git a/Kconfig.utestcases b/Kconfig.utestcases new file mode 100644 index 00000000000..e851ad39592 --- /dev/null +++ b/Kconfig.utestcases @@ -0,0 +1,28 @@ +menu "RT-Thread Utestcases" + +config RT_USING_UTESTCASES + bool "RT-Thread Utestcases" + default n + select RT_USING_UTEST + +if RT_USING_UTESTCASES + +rsource "examples/utest/testcases/utest/Kconfig" +rsource "examples/utest/testcases/kernel/Kconfig" +rsource "examples/utest/testcases/cpp11/Kconfig" +rsource "examples/utest/testcases/drivers/serial_v2/Kconfig" +rsource "examples/utest/testcases/drivers/serial_bypass/Kconfig" +rsource "examples/utest/testcases/drivers/ipc/Kconfig" +rsource "examples/utest/testcases/posix/Kconfig" +rsource "examples/utest/testcases/mm/Kconfig" +rsource "examples/utest/testcases/tmpfs/Kconfig" +rsource "examples/utest/testcases/smp_call/Kconfig" +rsource "examples/utest/testcases/perf/Kconfig" + +rsource "src/klibc/utest/Kconfig" + +rsource "components/drivers/audio/utest/Kconfig" + +endif + +endmenu diff --git a/components/drivers/audio/Kconfig b/components/drivers/audio/Kconfig index f6cae1ae6ce..48770ac0f0a 100644 --- a/components/drivers/audio/Kconfig +++ b/components/drivers/audio/Kconfig @@ -15,7 +15,4 @@ config RT_USING_AUDIO int "Record pipe size" default 2048 - config RT_UTEST_USING_AUDIO_DRIVER - bool "Enable rt_audio_api testcase" - default n endif diff --git a/components/drivers/audio/utest/Kconfig b/components/drivers/audio/utest/Kconfig new file mode 100644 index 00000000000..2ee22aef924 --- /dev/null +++ b/components/drivers/audio/utest/Kconfig @@ -0,0 +1,5 @@ +if RT_USING_AUDIO + config RT_UTEST_USING_AUDIO_DRIVER + bool "Enable rt_audio_api testcase" + default n +endif \ No newline at end of file diff --git a/examples/utest/testcases/Kconfig b/examples/utest/testcases/Kconfig deleted file mode 100644 index eec0e784445..00000000000 --- a/examples/utest/testcases/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -menu "RT-Thread Utestcases" - -config RT_USING_UTESTCASES - bool "RT-Thread Utestcases" - default n - select RT_USING_UTEST - -if RT_USING_UTESTCASES - -rsource "utest/Kconfig" -rsource "kernel/Kconfig" -rsource "cpp11/Kconfig" -rsource "drivers/serial_v2/Kconfig" -rsource "drivers/serial_bypass/Kconfig" -rsource "drivers/ipc/Kconfig" -rsource "posix/Kconfig" -rsource "mm/Kconfig" -rsource "tmpfs/Kconfig" -rsource "smp_call/Kconfig" -rsource "perf/Kconfig" -endif - -endmenu diff --git a/src/klibc/Kconfig b/src/klibc/Kconfig index bc90e90e8fa..daeb3dedeee 100644 --- a/src/klibc/Kconfig +++ b/src/klibc/Kconfig @@ -250,9 +250,4 @@ menu "klibc options" default n endmenu # rt_strnlen options - config RT_UTEST_TC_USING_KLIBC - bool "Enable klibc utest cases" - select RT_USING_UTEST - default n - endmenu diff --git a/src/klibc/utest/Kconfig b/src/klibc/utest/Kconfig new file mode 100644 index 00000000000..086a817e073 --- /dev/null +++ b/src/klibc/utest/Kconfig @@ -0,0 +1,4 @@ +config RT_UTEST_TC_USING_KLIBC + bool "Enable klibc utest cases" + select RT_USING_UTEST + default n diff --git a/tools/env_utility.py b/tools/env_utility.py index d950d077334..d7904ff0052 100644 --- a/tools/env_utility.py +++ b/tools/env_utility.py @@ -327,7 +327,7 @@ def get_file_md5(file): # Exclude utestcases def exclude_utestcases(RTT_ROOT): - if os.path.isfile(os.path.join(RTT_ROOT, 'examples/utest/testcases/Kconfig')): + if os.path.isfile(os.path.join(RTT_ROOT, 'Kconfig.utestcases')): return if not os.path.isfile(os.path.join(RTT_ROOT, 'Kconfig')): @@ -337,7 +337,7 @@ def exclude_utestcases(RTT_ROOT): data = f.readlines() with open(os.path.join(RTT_ROOT, 'Kconfig'), 'w') as f: for line in data: - if line.find('examples/utest/testcases/Kconfig') == -1: + if line.find('Kconfig.utestcases') == -1: f.write(line) diff --git a/tools/mkdist.py b/tools/mkdist.py index 89665719d57..838ae15ad5b 100644 --- a/tools/mkdist.py +++ b/tools/mkdist.py @@ -118,7 +118,7 @@ def bsp_update_kconfig_testcases(dist_dir): data = f.readlines() with open(os.path.join(dist_dir, 'rt-thread/Kconfig'), 'w') as f: for line in data: - if line.find('examples/utest/testcases/Kconfig') == -1: + if line.find('Kconfig.utestcases') == -1: f.write(line) def bsp_update_kconfig(dist_dir):