Skip to content

Commit 4051bfc

Browse files
committed
testing:merge apps-testing-dir case to the same directory
Signed-off-by: tengshuangshuang <[email protected]>
1 parent 121205f commit 4051bfc

File tree

269 files changed

+787
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+787
-175
lines changed

Diff for: testing/cxx/Make.defs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
############################################################################
2+
# apps/testing/cxx/Make.defs
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
############################################################################
22+
23+
include $(wildcard $(APPDIR)/testing/cxx/*/Make.defs)

Diff for: testing/cxx/Makefile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
############################################################################
2+
# apps/testing/cxx/Makefile
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
############################################################################
22+
23+
MENUDESC = "cxx"
24+
25+
include $(APPDIR)/Directory.mk
File renamed without changes.
File renamed without changes.

Diff for: testing/cxxsize/Make.defs renamed to testing/cxx/cxxsize/Make.defs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_CXXSIZE),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/cxxsize
24+
CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxsize
2525
endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: testing/cxxtest/Make.defs renamed to testing/cxx/cxxtest/Make.defs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_CXXTEST),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/cxxtest
24+
CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxtest
2525
endif
File renamed without changes.
File renamed without changes.

Diff for: testing/fs/Make.defs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
############################################################################
2+
# apps/testing/fs/Make.defs
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
############################################################################
22+
23+
include $(wildcard $(APPDIR)/testing/fs/*/Make.defs)

Diff for: testing/fs/Makefile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
############################################################################
2+
# apps/testing/fs/Makefile
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
############################################################################
22+
23+
MENUDESC = "fs"
24+
25+
include $(APPDIR)/Directory.mk

Diff for: testing/fs/cmocka/Kconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# For a description of the syntax of this configuration file,
3+
# see the file kconfig-language.txt in the NuttX tools repository.
4+
#
5+
6+
if TESTS_TESTSUITES
7+
8+
config CM_FS_TEST
9+
bool "enable fs test"
10+
default n
11+
12+
endif

Diff for: testing/fs/cmocka/Make.defs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
############################################################################
2+
# apps/testing/fs/cmocka/Make.defs
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
#
22+
############################################################################
23+
24+
ifneq ($(CONFIG_TESTS_TESTSUITES),)
25+
CONFIGURED_APPS += $(APPDIR)/testing/fs/cmocka
26+
endif

Diff for: testing/fs/cmocka/Makefile

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
############################################################################
2+
# apps/testing/fs/cmocka/Makefile
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
############################################################################
22+
23+
include $(APPDIR)/Make.defs
24+
25+
26+
PRIORITY = $(CONFIG_TESTS_TESTSUITES_PRIORITY)
27+
STACKSIZE = $(CONFIG_TESTS_TESTSUITES_STACKSIZE)
28+
MODULE = $(CONFIG_TESTS_TESTSUITES)
29+
30+
ifneq ($(CONFIG_CM_FS_TEST),)
31+
CFLAGS += -I$(CURDIR)/include
32+
CFLAGS += -I$(APPDIR)/nshlib
33+
CSRCS += $(wildcard cases/*.c)
34+
CSRCS += $(wildcard common/*.c)
35+
PROGNAME += cmocka_fs_test
36+
MAINSRC += $(CURDIR)/cmocka_fs_test.c
37+
endif
38+
39+
include $(APPDIR)/Application.mk
File renamed without changes.
File renamed without changes.

Diff for: testing/fdsantest/CMakeLists.txt renamed to testing/fs/fdsantest/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/fdsantest/CMakeLists.txt
2+
# apps/testing/fs/fdsantest/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
File renamed without changes.

Diff for: testing/fdsantest/Make.defs renamed to testing/fs/fdsantest/Make.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/fdsantest/Make.defs
2+
# apps/testing/fs/fdsantest/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_FDSAN_TEST),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/fdsantest
24+
CONFIGURED_APPS += $(APPDIR)/testing/fs/fdsantest
2525
endif

Diff for: testing/fdsantest/Makefile renamed to testing/fs/fdsantest/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/fdsantest/Makefile
2+
# apps/testing/fs/fdsantest/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: testing/fdsantest/fdsantest_simple.c renamed to testing/fs/fdsantest/fdsantest_simple.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
* apps/testing/fdsantest/fdsantest_simple.c
2+
* apps/testing/fs/fdsantest/fdsantest_simple.c
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
File renamed without changes.
File renamed without changes.

Diff for: testing/fstest/Make.defs renamed to testing/fs/fstest/Make.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/fstest/Make.defs
2+
# apps/testing/fs/fstest/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_FSTEST),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/fstest
24+
CONFIGURED_APPS += $(APPDIR)/testing/fs/fstest
2525
endif

Diff for: testing/fstest/Makefile renamed to testing/fs/fstest/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/fstest/Makefile
2+
# apps/testing/fs/fstest/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
File renamed without changes.

Diff for: testing/mtd_config_fs/CMakeLists.txt renamed to testing/fs/mtd_config_fs/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/mtd_config_fs/CMakeLists.txt
2+
# apps/testing/fs/mtd_config_fs/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
File renamed without changes.

Diff for: testing/mtd_config_fs/Make.defs renamed to testing/fs/mtd_config_fs/Make.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/mtd_config_fs/Make.defs
2+
# apps/testing/fs/mtd_config_fs/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/mtd_config_fs
24+
CONFIGURED_APPS += $(APPDIR)/testing/fs/mtd_config_fs
2525
endif

Diff for: testing/mtd_config_fs/Makefile renamed to testing/fs/mtd_config_fs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/mtd_config_fs/Makefile
2+
# apps/testing/fs/mtd_config_fs/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: testing/mtd_config_fs/mtd_config_fs_test_main.c renamed to testing/fs/mtd_config_fs/mtd_config_fs_test_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
* apps/testing/mtd_config_fs/mtd_config_fs_test_main.c
2+
* apps/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

Diff for: testing/mm/Make.defs

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,4 @@
2020
#
2121
############################################################################
2222

23-
ifneq ($(CONFIG_TESTING_MM),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/mm
25-
endif
23+
include $(wildcard $(APPDIR)/testing/mm/*/Make.defs)

Diff for: testing/mm/Makefile

+2-13
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@
2020
#
2121
############################################################################
2222

23-
include $(APPDIR)/Make.defs
23+
MENUDESC = "mm"
2424

25-
# Memory Management Test
26-
27-
PROGNAME = $(CONFIG_TESTING_MM_PROGNAME)
28-
PRIORITY = $(CONFIG_TESTING_MM_PRIORITY)
29-
STACKSIZE = $(CONFIG_TESTING_MM_STACKSIZE)
30-
MODULE = $(CONFIG_TESTING_MM)
31-
32-
MAINSRC = mm_main.c
33-
34-
CFLAGS += -I$(TOPDIR)/mm/mm_heap
35-
36-
include $(APPDIR)/Application.mk
25+
include $(APPDIR)/Directory.mk

Diff for: testing/cachetest/CMakeLists.txt renamed to testing/mm/cachetest/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/cachetest/CMakeLists.txt
2+
# apps/testing/mm/cachetest/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
File renamed without changes.

Diff for: testing/cachetest/Make.defs renamed to testing/mm/cachetest/Make.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/cachetest/Make.defs
2+
# apps/testing/mm/cachetest/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -21,5 +21,5 @@
2121
############################################################################
2222

2323
ifneq ($(CONFIG_TESTING_CACHETEST),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/cachetest
24+
CONFIGURED_APPS += $(APPDIR)/testing/mm/cachetest
2525
endif

Diff for: testing/cachetest/Makefile renamed to testing/mm/cachetest/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/cachetest/Makefile
2+
# apps/testing/mm/cachetest/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
File renamed without changes.

Diff for: testing/mm/cmocka/Kconfig

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
config TESTS_TESTSUITES
2+
tristate "vela test suite"
3+
default n
4+
depends on TESTING_CMOCKA
5+
---help---
6+
Enable testsuites for the vela
7+
8+
if TESTS_TESTSUITES
9+
10+
config TESTS_TESTSUITES_MOUNT_DIR
11+
string "Mount directory for the testsuites"
12+
default "/data"
13+
14+
config TESTS_TESTSUITES_PRIORITY
15+
int "Testsuites task priority"
16+
default 99
17+
18+
config TESTS_TESTSUITES_STACKSIZE
19+
int "Testsuites stack size"
20+
default 16384
21+
22+
config CM_MM_TEST
23+
bool "enbale MM test"
24+
default n
25+
26+
endif # TESTS_TESTSUITES

0 commit comments

Comments
 (0)