From e725b889518c7625268160f68bf8111fc86b9c51 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 9 Aug 2023 16:40:56 -0400 Subject: [PATCH] Fix test cases that recently regressed Recently new extensions were added to CDT for C++ modules in #422 At the time some test failures were not noticed. This change patches those failing tests. Fixes #454 --- .../test30Projects/test30_2/Benchmarks/sources.mk | 3 +++ .../test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile | 9 +++++++++ .../Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk | 6 ++++++ .../test40Projects/test_40/Benchmarks/dbg 2/makefile | 9 +++++++++ .../test40Projects/test_40/Benchmarks/dbg 2/sources.mk | 6 ++++++ .../tests/suite/ManagedBuilderPreconditionsTests.java | 3 ++- 6 files changed, 35 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk index 16fbadf46ce..af1ca6bbb9f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk @@ -3,9 +3,12 @@ ################################################################################ ASM_SRCS := +C++M_SRCS := C++_SRCS := +CCM_SRCS := CC_SRCS := CPP_SRCS := +CXXM_SRCS := CXX_SRCS := C_UPPER_SRCS := LOG_SRCS := diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile index 353572bc2fc..bd9f498498b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile @@ -18,15 +18,24 @@ RM := rm -rf -include d1/subdir.mk ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C++M_DEPS)),) +-include $(C++M_DEPS) +endif ifneq ($(strip $(C++_DEPS)),) -include $(C++_DEPS) endif +ifneq ($(strip $(CCM_DEPS)),) +-include $(CCM_DEPS) +endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif ifneq ($(strip $(CPP_DEPS)),) -include $(CPP_DEPS) endif +ifneq ($(strip $(CXXM_DEPS)),) +-include $(CXXM_DEPS) +endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk index 463597703f3..88fed6c1180 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk @@ -3,18 +3,24 @@ ################################################################################ ASM_SRCS := +C++M_SRCS := C++_SRCS := +CCM_SRCS := CC_SRCS := CPP_SRCS := +CXXM_SRCS := CXX_SRCS := C_SRCS := C_UPPER_SRCS := OBJ_SRCS := O_SRCS := S_UPPER_SRCS := +C++M_DEPS := C++_DEPS := +CCM_DEPS := CC_DEPS := CPP_DEPS := +CXXM_DEPS := CXX_DEPS := C_DEPS := C_UPPER_DEPS := diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile index 841089e9c43..8fdef7be694 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile @@ -18,15 +18,24 @@ RM := rm -rf -include d1/subdir.mk ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C++M_DEPS)),) +-include $(C++M_DEPS) +endif ifneq ($(strip $(C++_DEPS)),) -include $(C++_DEPS) endif +ifneq ($(strip $(CCM_DEPS)),) +-include $(CCM_DEPS) +endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif ifneq ($(strip $(CPP_DEPS)),) -include $(CPP_DEPS) endif +ifneq ($(strip $(CXXM_DEPS)),) +-include $(CXXM_DEPS) +endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk index 463597703f3..88fed6c1180 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk @@ -3,18 +3,24 @@ ################################################################################ ASM_SRCS := +C++M_SRCS := C++_SRCS := +CCM_SRCS := CC_SRCS := CPP_SRCS := +CXXM_SRCS := CXX_SRCS := C_SRCS := C_UPPER_SRCS := OBJ_SRCS := O_SRCS := S_UPPER_SRCS := +C++M_DEPS := C++_DEPS := +CCM_DEPS := CC_DEPS := CPP_DEPS := +CXXM_DEPS := CXX_DEPS := C_DEPS := C_UPPER_DEPS := diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java index f93fd67ddee..86010f1ab0a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java @@ -57,7 +57,8 @@ public class ManagedBuilderPreconditionsTests extends BaseTestCase { IContentType contentTypeC = manager.getContentType(CCorePlugin.CONTENT_TYPE_CSOURCE); fileExts.addAll(Arrays.asList(contentTypeC.getFileSpecs(IContentType.FILE_EXTENSION_SPEC))); - Set expectedExts = new TreeSet<>(Arrays.asList(new String[] { "C", "c", "c++", "cc", "cpp", "cxx" })); + Set expectedExts = new TreeSet<>( + Arrays.asList(new String[] { "C", "c", "c++", "cc", "cpp", "cxx", "ccm", "cxxm", "c++m" })); assertEquals("Precodition FAILED - Content Types do not match expected defaults.", expectedExts.toString(), fileExts.toString()); }