diff options
| author | Jeff Johnston | 2012-03-29 21:23:19 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2012-03-29 22:19:39 +0000 |
| commit | cf9b34cd0841a7411bf17d529161c098e7a70ffb (patch) | |
| tree | 690b42f218f3f6254cdaf1103815b39c19e8cb9b | |
| parent | 3606e0c5125d8f09eda41a9fd01cc37b00ab141c (diff) | |
| download | org.eclipse.cdt-cf9b34cd0841a7411bf17d529161c098e7a70ffb.tar.gz org.eclipse.cdt-cf9b34cd0841a7411bf17d529161c098e7a70ffb.tar.xz org.eclipse.cdt-cf9b34cd0841a7411bf17d529161c098e7a70ffb.zip | |
Fix Autotools tests to refresh resources after build.
| -rw-r--r-- | build/org.eclipse.cdt.autotools.tests/ChangeLog | 5 | ||||
| -rw-r--r-- | build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.autotools.tests/ChangeLog b/build/org.eclipse.cdt.autotools.tests/ChangeLog index 8badfcb4710..7d06216d7ed 100644 --- a/build/org.eclipse.cdt.autotools.tests/ChangeLog +++ b/build/org.eclipse.cdt.autotools.tests/ChangeLog @@ -1,3 +1,8 @@ +2012-03-29 Jeff Johnston <jjohnstn@redhat.com> + + * src/org/eclipse/cdt/autotools/tests/ProjectTools.java (build): Refresh the workspace root so resource tests + will work consistently. + 2012-01-03 Jeff Johnston <jjohnstn@redhat.com> Refactor to org.eclipse.cdt.autotools.tests. diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java index b3633bd6654..a890eb0a676 100644 --- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java +++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java @@ -13,6 +13,8 @@ import org.eclipse.cdt.core.CommandLauncher; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.internal.autotools.core.configure.AutotoolsConfigurationManager; import org.eclipse.cdt.internal.autotools.core.configure.IAConfiguration; +import org.eclipse.cdt.internal.autotools.ui.wizards.ConvertToAutotoolsProjectWizard; +import org.eclipse.cdt.internal.autotools.ui.wizards.ConvertToAutotoolsProjectWizardPage; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IProjectType; @@ -23,6 +25,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceDescription; import org.eclipse.core.resources.IWorkspaceRoot; @@ -35,8 +38,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.cdt.internal.autotools.ui.wizards.ConvertToAutotoolsProjectWizard; -import org.eclipse.cdt.internal.autotools.ui.wizards.ConvertToAutotoolsProjectWizardPage; import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider; @@ -83,6 +84,7 @@ public class ProjectTools { public static boolean build() { try { workspace.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor()); + workspace.getRoot().refreshLocal(IResource.DEPTH_INFINITE, getMonitor()); } catch (CoreException e) { return false; } |