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.

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

The placement of cases under testing is a bit messy, and cases of the same type need to be merged #2931

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,11 @@ build
.ccls-cache
compile_commands.json
.aider*
testing/arch/Kconfig
testing/cxx/Kconfig
testing/driver/Kconfig
testing/fs/Kconfig
testing/libc/Kconfig
testing/mm/Kconfig
testing/sched/Kconfig
testing/security/Kconfig
24 changes: 24 additions & 0 deletions testing/arch/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# ##############################################################################
# apps/testing/arch/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 "arch")
23 changes: 23 additions & 0 deletions testing/arch/Make.defs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/testing/arch/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/arch/*/Make.defs)
25 changes: 25 additions & 0 deletions testing/arch/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
############################################################################
# apps/testing/arch/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 = "arch"

include $(APPDIR)/Directory.mk
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/himem_test/LibIncludes.mk
# apps/testing/arch/himem_test/LibIncludes.mk
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/himem_test/Make.defs
# apps/testing/arch/himem_test/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -22,5 +22,5 @@


ifneq ($(CONFIG_TESTING_HIMEM_TEST),)
CONFIGURED_APPS += $(APPDIR)/testing/himem_test
CONFIGURED_APPS += $(APPDIR)/testing/arch/himem_test
endif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/himem_test/Makefile
# apps/testing/arch/himem_test/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -22,7 +22,7 @@


include $(APPDIR)/Make.defs
include $(APPDIR)/testing/himem_test/LibIncludes.mk
include $(APPDIR)/testing/arch/himem_test/LibIncludes.mk


# built-in application info
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/testing/himem_test/himem_chardev_test.c
* apps/testing/arch/himem_test/himem_chardev_test.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/mtetest/CMakeLists.txt
# apps/testing/arch/mtetest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/mtetest/Make.defs → testing/arch/mtetest/Make.defs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/mtetest/Make.defs
# apps/testing/arch/mtetest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_MTE),)
CONFIGURED_APPS += $(APPDIR)/testing/mtetest
CONFIGURED_APPS += $(APPDIR)/testing/arch/mtetest
endif
2 changes: 1 addition & 1 deletion testing/mtetest/Makefile → testing/arch/mtetest/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/mtetest/Makefile
# apps/testing/arch/mtetest/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/mtetest/mtetest.c
* apps/testing/arch/mtetest/mtetest.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/system/uorb/Make.defs
# apps/testing/arch/x86-64-ABI/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_X86_64_ABI),)
CONFIGURED_APPS += $(APPDIR)/testing/x86-64-ABI
CONFIGURED_APPS += $(APPDIR)/testing/arch/x86-64-ABI
endif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/x86-64-ABI/Makefile
# apps/testing/arch/x86-64-ABI/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
24 changes: 24 additions & 0 deletions testing/cxx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# ##############################################################################
# apps/testing/cxx/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 "cxx")
23 changes: 23 additions & 0 deletions testing/cxx/Make.defs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/testing/cxx/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/cxx/*/Make.defs)
25 changes: 25 additions & 0 deletions testing/cxx/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
############################################################################
# apps/testing/cxx/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 = "cxx"

include $(APPDIR)/Directory.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ##############################################################################
# apps/testing/cxxsize/CMakeLists.txt
# apps/testing/cxx/cxxsize/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/cxxsize/Make.defs → testing/cxx/cxxsize/Make.defs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/cxxtest/Make.defs
# apps/testing/cxx/cxxtest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -21,5 +21,5 @@
############################################################################

ifneq ($(CONFIG_TESTING_CXXSIZE),)
CONFIGURED_APPS += $(APPDIR)/testing/cxxsize
CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxsize
endif
2 changes: 1 addition & 1 deletion testing/cxxsize/Makefile → testing/cxx/cxxsize/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/cxxtest/Makefile
# apps/testing/cxx/cxxtest/Makefile
#
# 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/cxxsize/array.cxx
// apps/testing/cxx/cxxsize/array.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/condition_variable.cxx
// apps/testing/cxx/cxxsize/condition_variable.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/deque.cxx
// apps/testing/cxx/cxxsize/deque.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/exception.cxx
// apps/testing/cxx/cxxsize/exception.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/forward_list.cxx
// apps/testing/cxx/cxxsize/forward_list.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/future.cxx
// apps/testing/cxx/cxxsize/future.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/iostream.cxx
// apps/testing/cxx/cxxsize/iostream.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
2 changes: 1 addition & 1 deletion testing/cxxsize/list.cxx → testing/cxx/cxxsize/list.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/list.cxx
// apps/testing/cxx/cxxsize/list.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
2 changes: 1 addition & 1 deletion testing/cxxsize/map.cxx → testing/cxx/cxxsize/map.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/map.cxx
// apps/testing/cxx/cxxsize/map.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/multiset.cxx
// apps/testing/cxx/cxxsize/multiset.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/mutex.cxx
// apps/testing/cxx/cxxsize/mutex.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
2 changes: 1 addition & 1 deletion testing/cxxsize/rtti.cxx → testing/cxx/cxxsize/rtti.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/rtti.cxx
// apps/testing/cxx/cxxsize/rtti.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/semaphore.cxx
// apps/testing/cxx/cxxsize/semaphore.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
2 changes: 1 addition & 1 deletion testing/cxxsize/set.cxx → testing/cxx/cxxsize/set.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/set.cxx
// apps/testing/cxx/cxxsize/set.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***************************************************************************
// apps/testing/cxxsize/shared_ptr.cxx
// apps/testing/cxx/cxxsize/shared_ptr.cxx
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
Loading
Loading