Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apps/testing:move atomic,cpuload,getprime,smp and timerjitter folders to the new sched folder #2974

Merged
merged 1 commit into from
Jan 25, 2025
Merged

apps/testing:move atomic,cpuload,getprime,smp and timerjitter folders to the new sched folder #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions testing/cpuload/CMakeLists.txt → system/cpuload/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/cpuload/CMakeLists.txt
# apps/system/cpuload/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -20,7 +20,7 @@
#
# ##############################################################################

if(CONFIG_TESTING_CPULOAD)
if(CONFIG_SYSTEM_CPULOAD)
nuttx_add_application(
NAME
cpuload
Expand All @@ -29,7 +29,7 @@ if(CONFIG_TESTING_CPULOAD)
STACKSIZE
${CONFIG_DEFAULT_TASK_STACKSIZE}
MODULE
${CONFIG_TESTING_CPULOAD}
${CONFIG_SYSTEM_CPULOAD}
SRCS
cpuload_main.c)
endif()
2 changes: 1 addition & 1 deletion testing/cpuload/Kconfig → system/cpuload/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#

config TESTING_CPULOAD
config SYSTEM_CPULOAD
tristate "cpuload test"
default n
6 changes: 3 additions & 3 deletions testing/cpuload/Make.defs → system/cpuload/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/cpuload/Make.defs
# apps/system/cpuload/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -20,6 +20,6 @@
#
############################################################################

ifneq ($(CONFIG_TESTING_CPULOAD),)
CONFIGURED_APPS += $(APPDIR)/testing/cpuload
ifneq ($(CONFIG_SYSTEM_CPULOAD),)
CONFIGURED_APPS += $(APPDIR)/testing/sched/cpuload
endif
4 changes: 2 additions & 2 deletions testing/cpuload/Makefile → system/cpuload/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/cpuload/Makefile
# apps/system/cpuload/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -25,7 +25,7 @@ include $(APPDIR)/Make.defs
PROGNAME = cpuload
PRIORITY = 253
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_TESTING_CPULOAD)
MODULE = $(CONFIG_SYSTEM_CPULOAD)

MAINSRC = cpuload_main.c

Expand Down
2 changes: 1 addition & 1 deletion testing/cpuload/cpuload_main.c → system/cpuload/cpuload_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/cpuload/cpuload_main.c
* apps/system/cpuload/cpuload_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
2 changes: 1 addition & 1 deletion testing/atomic/CMakeLists.txt → testing/libc/atomic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/atomic/CMakeLists.txt
# apps/testing/libc/atomic/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
0 testing/atomic/Kconfig → testing/libc/atomic/Kconfig
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/atomic/Make.defs → testing/libc/atomic/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/atomic/Make.defs
# apps/testing/libc/atomic/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_ATOMIC),)
CONFIGURED_APPS += $(APPDIR)/testing/atomic
CONFIGURED_APPS += $(APPDIR)/testing/sched/atomic
endif
2 changes: 1 addition & 1 deletion testing/atomic/Makefile → testing/libc/atomic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/atomic/Makefile
# apps/testing/libc/atomic/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/atomic/atomic_main.c → testing/libc/atomic/atomic_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/atomic/atomic_main.c
* apps/testing/libc/atomic/atomic_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
1 change: 1 addition & 0 deletions testing/sched/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Kconfig
24 changes: 24 additions & 0 deletions testing/sched/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# ##############################################################################
# apps/testing/sched/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

nuttx_add_subdirectory()
nuttx_generate_kconfig(MENUDESC "sched")
23 changes: 23 additions & 0 deletions testing/sched/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/testing/sched/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################

include $(wildcard $(APPDIR)/testing/sched/*/Make.defs)
25 changes: 25 additions & 0 deletions testing/sched/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
############################################################################
# apps/testing/sched/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################

MENUDESC = "sched"

include $(APPDIR)/Directory.mk
2 changes: 1 addition & 1 deletion testing/getprime/CMakeLists.txt → testing/sched/getprime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/getprime/CMakeLists.txt
# apps/testing/sched/getprime/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
0 testing/getprime/Kconfig → testing/sched/getprime/Kconfig
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/getprime/Make.defs → testing/sched/getprime/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/getprime/Make.defs
# apps/testing/sched/getprime/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_GETPRIME),)
CONFIGURED_APPS += $(APPDIR)/testing/getprime
CONFIGURED_APPS += $(APPDIR)/testing/sched/getprime
endif
2 changes: 1 addition & 1 deletion testing/getprime/Makefile → testing/sched/getprime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/getprime/Makefile
# apps/testing/sched/getprime/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/getprime/getprime_main.c → testing/sched/getprime/getprime_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/getprime/getprime_main.c
* apps/testing/sched/getprime/getprime_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
2 changes: 1 addition & 1 deletion testing/smp/CMakeLists.txt → testing/sched/smp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/smp/CMakeLists.txt
# apps/testing/sched/smp/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
0 testing/smp/Kconfig → testing/sched/smp/Kconfig
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/smp/Make.defs → testing/sched/smp/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/smp/Make.defs
# apps/testing/sched/smp/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_SMP),)
CONFIGURED_APPS += $(APPDIR)/testing/smp
CONFIGURED_APPS += $(APPDIR)/testing/sched/smp
endif
2 changes: 1 addition & 1 deletion testing/smp/Makefile → testing/sched/smp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/smp/Makefile
# apps/testing/sched/smp/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/smp/smp_main.c → testing/sched/smp/smp_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/smp/smp_main.c
* apps/testing/sched/smp/smp_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
2 changes: 1 addition & 1 deletion testing/timerjitter/CMakeLists.txt → testing/sched/timerjitter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/timerjitter/CMakeLists.txt
# apps/testing/sched/timerjitter/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
0 testing/timerjitter/Kconfig → testing/sched/timerjitter/Kconfig
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/timerjitter/Make.defs → testing/sched/timerjitter/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/timerjitter/Make.defs
# apps/testing/sched/timerjitter/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_TIMERJITTER),)
CONFIGURED_APPS += $(APPDIR)/testing/timerjitter
CONFIGURED_APPS += $(APPDIR)/testing/sched/timerjitter
endif
2 changes: 1 addition & 1 deletion testing/timerjitter/Makefile → testing/sched/timerjitter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/timerjitter/Makefile
# apps/testing/sched/timerjitter/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/timerjitter/timerjitter.c → testing/sched/timerjitter/timerjitter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/timerjitter/timerjitter.c
* apps/testing/sched/timerjitter/timerjitter.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
Loading