Skip to content

Commit

Permalink
apps/testing:move epoll, fatutf8 ... folders to the new fs folder
Browse files Browse the repository at this point in the history
Signed-off-by: tengshuangshuang <[email protected]>
  • Loading branch information
txy-21 committed Jan 21, 2025
1 parent a13e928 commit ff9921b
Show file tree
Hide file tree
Showing 48 changed files with 118 additions and 45 deletions.
1 change: 1 addition & 0 deletions testing/fs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/kconfig
24 changes: 24 additions & 0 deletions testing/fs/CMakeLists.txt
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
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
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
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
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/epoll/Make.defs → testing/fs/epoll/Make.defs
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
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
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
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
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/fatutf8/Make.defs → testing/fs/fatutf8/Make.defs
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
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
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
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
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
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
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
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
File renamed without changes.
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
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
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
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
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/fstest/Make.defs → testing/fs/fstest/Make.defs
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
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
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
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
File renamed without changes.
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
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
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
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
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/nxffs/Make.defs → testing/fs/nxffs/Make.defs
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
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
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
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
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/smart/Make.defs → testing/fs/smart/Make.defs
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
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
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
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
File renamed without changes.
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
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
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

0 comments on commit ff9921b

Please sign in to comment.