From 320bb231c2a73f8f85dbf2d4533dfb7953c08333 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 27 Oct 2022 10:19:02 -0400 Subject: [PATCH] Delete contents on disk when cleaning up after test The resource helper is widely used, but when it deletes projects, it leaves their contents on disk. Fix this so that the contents on disk is deleted. Part of #117 --- .../org/eclipse/cdt/core/testplugin/ResourceHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java index e665e994f93..da5d0d37e8a 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java @@ -728,10 +728,10 @@ public class ResourceHelper { // Remove IResources created by this helper for (IResource r : resourcesCreated) { if (r.exists()) { - try { + if (r instanceof IProject p) { + p.delete(true, true, NULL_MONITOR); + } else { r.delete(true, NULL_MONITOR); - } catch (CoreException e) { - // Ignore } } }