Skip to content

Commit 78cd37e

Browse files
akurtakovakurtakov
committed
Fix valgrind tests with GCC 15
Hardcode std17 to ensure that the "broken" example will keep compiling so valgrind can show its analysis.
1 parent 87f1458 commit 78cd37e

File tree

1 file changed

+21
-12
lines changed
  • valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest

1 file changed

+21
-12
lines changed

Diff for: ‎valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.cproject

+21-12
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@
1414
</extensions>
1515
</storageModule>
1616
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17-
<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.558688055" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
17+
<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.558688055" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
1818
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.558688055." name="/" resourcePath="">
1919
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1553639182" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
2020
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.930970241" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
21-
<builder buildPath="${workspace_loc:/alloctest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1027317050" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
21+
<builder buildPath="${workspace_loc:/alloctest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1027317050" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
2222
<tool id="cdt.managedbuild.tool.gnu.archiver.base.628989124" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
2323
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.998849290" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
24-
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.984020833" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
25-
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.215620373" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
24+
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.984020833" name="Optimization level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
25+
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.215620373" name="Debug level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
2626
</tool>
2727
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1985855997" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
28-
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2008189820" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
29-
<option id="gnu.c.compiler.exe.debug.option.debugging.level.1871634291" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
28+
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2008189820" name="Optimization level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
29+
<option id="gnu.c.compiler.exe.debug.option.debugging.level.1871634291" name="Debug level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
30+
<option id="gnu.c.compiler.option.dialect.std.619416598" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.c17" valueType="enumerated"/>
3031
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.710416077" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
3132
</tool>
3233
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1681416185" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
@@ -58,19 +59,19 @@
5859
</extensions>
5960
</storageModule>
6061
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
61-
<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1843335050" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
62+
<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1843335050" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
6263
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1843335050." name="/" resourcePath="">
6364
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1538991542" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
6465
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1264481039" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
65-
<builder buildPath="${workspace_loc:/alloctest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.2088301363" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
66+
<builder buildPath="${workspace_loc:/alloctest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.2088301363" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
6667
<tool id="cdt.managedbuild.tool.gnu.archiver.base.588443825" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
6768
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1567078160" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
68-
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1694052336" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
69-
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.661433144" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
69+
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1694052336" name="Optimization level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
70+
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.661433144" name="Debug level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
7071
</tool>
7172
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1731562352" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
72-
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.275422102" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
73-
<option id="gnu.c.compiler.exe.release.option.debugging.level.541314912" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
73+
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.275422102" name="Optimization level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
74+
<option id="gnu.c.compiler.exe.release.option.debugging.level.541314912" name="Debug level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
7475
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1354508894" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
7576
</tool>
7677
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1584524011" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
@@ -343,4 +344,12 @@
343344
</scannerConfigBuildInfo>
344345
</storageModule>
345346
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
347+
<storageModule moduleId="refreshScope" versionNumber="2">
348+
<configuration configurationName="Debug">
349+
<resource resourceType="PROJECT" workspacePath="/alloctest"/>
350+
</configuration>
351+
<configuration configurationName="Release">
352+
<resource resourceType="PROJECT" workspacePath="/alloctest"/>
353+
</configuration>
354+
</storageModule>
346355
</cproject>

0 commit comments

Comments
 (0)