Skip to content

apps/testing:move epoll, fatutf8 ... folders to the new fs folder #2963

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

Merged
merged 1 commit into from
Jan 21, 2025
Merged

apps/testing:move epoll, fatutf8 ... folders to the new fs folder #2963

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
1 change: 1 addition & 0 deletions testing/fs/.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/fs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# ##############################################################################
# apps/testing/fs/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 "fs")
23 changes: 23 additions & 0 deletions testing/fs/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/testing/fs/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/fs/*/Make.defs)
25 changes: 25 additions & 0 deletions testing/fs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
############################################################################
# apps/testing/fs/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 = "fs"

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

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

ifneq ($(CONFIG_TESTING_FATUTF8),)
CONFIGURED_APPS += $(APPDIR)/testing/fatutf8
CONFIGURED_APPS += $(APPDIR)/testing/fs/fatutf8
endif
2 changes: 1 addition & 1 deletion testing/fatutf8/Makefile → testing/fs/fatutf8/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/fatutf8/Makefile
# apps/testing/fs/fatutf8/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/fatutf8/fatutf8_main.c → testing/fs/fatutf8/fatutf8_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/fatutf8/fatutf8_main.c
* apps/testing/fs/fatutf8/fatutf8_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
2 changes: 1 addition & 1 deletion testing/fdsantest/CMakeLists.txt → testing/fs/fdsantest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/fdsantest/CMakeLists.txt
# apps/testing/fs/fdsantest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion testing/fdsantest/Kconfig → testing/fs/fdsantest/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

config TESTING_FDSAN_TEST
tristate "vela cmocka fdsan test"
tristate "Nuttx cmocka fdsan test"
default n
depends on TESTING_CMOCKA
---help---
Expand Down
4 changes: 2 additions & 2 deletions testing/fdsantest/Make.defs → testing/fs/fdsantest/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/fdsantest/Make.defs
# apps/testing/fs/fdsantest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

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

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

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

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

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

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

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