Skip to content

Commit 0ae0e37

Browse files
txy-21xiaoxiang781216
txy-21
authored and
xiaoxiang781216
committed
apps/testing:move atomic,cpuload,getprime,smp and timerjitter folders to the new sched folder
Signed-off-by: tengshuangshuang <[email protected]>
1 parent d3a1f80 commit 0ae0e37

29 files changed

+103
-30
lines changed

Diff for: ‎testing/cpuload/CMakeLists.txt renamed to ‎system/cpuload/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/cpuload/CMakeLists.txt
2+
# apps/system/cpuload/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -20,7 +20,7 @@
2020
#
2121
# ##############################################################################
2222

23-
if(CONFIG_TESTING_CPULOAD)
23+
if(CONFIG_SYSTEM_CPULOAD)
2424
nuttx_add_application(
2525
NAME
2626
cpuload
@@ -29,7 +29,7 @@ if(CONFIG_TESTING_CPULOAD)
2929
STACKSIZE
3030
${CONFIG_DEFAULT_TASK_STACKSIZE}
3131
MODULE
32-
${CONFIG_TESTING_CPULOAD}
32+
${CONFIG_SYSTEM_CPULOAD}
3333
SRCS
3434
cpuload_main.c)
3535
endif()

Diff for: ‎testing/cpuload/Kconfig renamed to ‎system/cpuload/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# see the file kconfig-language.txt in the NuttX tools repository.
44
#
55

6-
config TESTING_CPULOAD
6+
config SYSTEM_CPULOAD
77
tristate "cpuload test"
88
default n

Diff for: ‎testing/cpuload/Make.defs renamed to ‎system/cpuload/Make.defs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/cpuload/Make.defs
2+
# apps/system/cpuload/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -20,6 +20,6 @@
2020
#
2121
############################################################################
2222

23-
ifneq ($(CONFIG_TESTING_CPULOAD),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/cpuload
23+
ifneq ($(CONFIG_SYSTEM_CPULOAD),)
24+
CONFIGURED_APPS += $(APPDIR)/testing/sched/cpuload
2525
endif

Diff for: ‎testing/cpuload/Makefile renamed to ‎system/cpuload/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/testing/cpuload/Makefile
2+
# apps/system/cpuload/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -25,7 +25,7 @@ include $(APPDIR)/Make.defs
2525
PROGNAME = cpuload
2626
PRIORITY = 253
2727
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
28-
MODULE = $(CONFIG_TESTING_CPULOAD)
28+
MODULE = $(CONFIG_SYSTEM_CPULOAD)
2929

3030
MAINSRC = cpuload_main.c
3131

Diff for: ‎testing/cpuload/cpuload_main.c renamed to ‎system/cpuload/cpuload_main.c

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

Diff for: ‎testing/atomic/CMakeLists.txt renamed to ‎testing/libc/atomic/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/atomic/CMakeLists.txt
2+
# apps/testing/libc/atomic/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: ‎testing/atomic/Kconfig renamed to ‎testing/libc/atomic/Kconfig

File renamed without changes.

Diff for: ‎testing/atomic/Make.defs renamed to ‎testing/libc/atomic/Make.defs

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

2323
ifneq ($(CONFIG_TESTING_ATOMIC),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/atomic
24+
CONFIGURED_APPS += $(APPDIR)/testing/sched/atomic
2525
endif

Diff for: ‎testing/atomic/Makefile renamed to ‎testing/libc/atomic/Makefile

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

Diff for: ‎testing/atomic/atomic_main.c renamed to ‎testing/libc/atomic/atomic_main.c

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

Diff for: ‎testing/sched/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Kconfig

Diff for: ‎testing/sched/CMakeLists.txt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# ##############################################################################
2+
# apps/testing/sched/CMakeLists.txt
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
7+
# license agreements. See the NOTICE file distributed with this work for
8+
# additional information regarding copyright ownership. The ASF licenses this
9+
# file to you under the Apache License, Version 2.0 (the "License"); you may not
10+
# use this file except in compliance with the License. You may obtain a copy of
11+
# 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 under
19+
# the License.
20+
#
21+
# ##############################################################################
22+
23+
nuttx_add_subdirectory()
24+
nuttx_generate_kconfig(MENUDESC "sched")

Diff for: ‎testing/sched/Make.defs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
############################################################################
2+
# apps/testing/sched/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/sched/*/Make.defs)

Diff for: ‎testing/sched/Makefile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
############################################################################
2+
# apps/testing/sched/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 = "sched"
24+
25+
include $(APPDIR)/Directory.mk

Diff for: ‎testing/getprime/CMakeLists.txt renamed to ‎testing/sched/getprime/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/getprime/CMakeLists.txt
2+
# apps/testing/sched/getprime/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: ‎testing/getprime/Kconfig renamed to ‎testing/sched/getprime/Kconfig

File renamed without changes.

Diff for: ‎testing/getprime/Make.defs renamed to ‎testing/sched/getprime/Make.defs

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

2323
ifneq ($(CONFIG_TESTING_GETPRIME),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/getprime
24+
CONFIGURED_APPS += $(APPDIR)/testing/sched/getprime
2525
endif

Diff for: ‎testing/getprime/Makefile renamed to ‎testing/sched/getprime/Makefile

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

Diff for: ‎testing/getprime/getprime_main.c renamed to ‎testing/sched/getprime/getprime_main.c

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

Diff for: ‎testing/smp/CMakeLists.txt renamed to ‎testing/sched/smp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/smp/CMakeLists.txt
2+
# apps/testing/sched/smp/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: ‎testing/smp/Kconfig renamed to ‎testing/sched/smp/Kconfig

File renamed without changes.

Diff for: ‎testing/smp/Make.defs renamed to ‎testing/sched/smp/Make.defs

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

2323
ifneq ($(CONFIG_TESTING_SMP),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/smp
24+
CONFIGURED_APPS += $(APPDIR)/testing/sched/smp
2525
endif

Diff for: ‎testing/smp/Makefile renamed to ‎testing/sched/smp/Makefile

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

Diff for: ‎testing/smp/smp_main.c renamed to ‎testing/sched/smp/smp_main.c

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

Diff for: ‎testing/timerjitter/CMakeLists.txt renamed to ‎testing/sched/timerjitter/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/testing/timerjitter/CMakeLists.txt
2+
# apps/testing/sched/timerjitter/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

Diff for: ‎testing/timerjitter/Kconfig renamed to ‎testing/sched/timerjitter/Kconfig

File renamed without changes.

Diff for: ‎testing/timerjitter/Make.defs renamed to ‎testing/sched/timerjitter/Make.defs

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

2323
ifneq ($(CONFIG_TESTING_TIMERJITTER),)
24-
CONFIGURED_APPS += $(APPDIR)/testing/timerjitter
24+
CONFIGURED_APPS += $(APPDIR)/testing/sched/timerjitter
2525
endif

Diff for: ‎testing/timerjitter/Makefile renamed to ‎testing/sched/timerjitter/Makefile

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

Diff for: ‎testing/timerjitter/timerjitter.c renamed to ‎testing/sched/timerjitter/timerjitter.c

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

0 commit comments

Comments
 (0)