From fef92c58ea9ba436225ba7335081779bdab1364c Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Wed, 10 May 2006 19:30:59 +0000
Subject: [PATCH] Remove the .settings directory from the TestProjectConversion
 .zip file. It seems to be what was causing a race condition with the PDOM
 trying to acess the .cdtbuild file before it was unzipped.

---
 .../testProjectConversion.zip                 | Bin 1788 -> 1385 bytes
 .../testplugin/ManagedBuildTestHelper.java    |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/testProjectConversion/testProjectConversion.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/toolChainConversionProjects/testProjectConversion/testProjectConversion.zip
index 82f05c4b0d751acaa8a03047383d6b32222184ee..4816a722a6971651ecc4b962963d1901d2c65b84 100644
GIT binary patch
delta 59
zcmeyv`;u#e1JmXr=2c9SYuQwoY?vl5W;0VxVPas=OHL_CD$UGE3GilRV*mmcAiM{p
IOIbiX00__xwg3PC

delta 472
zcmaFK^@n$Z15>>S0|NsG!_KHY<B75wpC5vFObiUhKw7UjwWK67FTGelzbIWVH904<
zpg2`8Ii*A|H!&|UJvAk%G&3h9wMZ{HzbI9&peQx1cx%8#ufq-kHR6BTpZ?0x3-?vN
z6tN^sCxdgwK31oyo6{zrj@uE#Z-2j8V_T~d$EM$#jO%wBpXrO^J$R}@z+B--tc+Fb
zpS2BzGV0UCHMYL0>apsM-r^zj`^4h6Qy2QM%-XZ5ElTCMdG*rSNBK9Xto+Vf)V}xh
z+DiAAN|_m}%cgcb3OK1UbIHq6v$?ffr1piJ?qQwgxWTA*QS6NCM=xL1oqc!uwk0nc
zA2a;8wW?~d;EFuM9E0<p+aJwre0kwop1_tHQvE&iEmuri{qyv%!oa^}C;iX%%U|GC
z{6D9C{`Eim)$3;0F>SVCTE~=#JJf&y$H2&-03>aI;Ydap26!_vi7-rdV3OhinZ>{$
n0K|FBlLc7Kl&3KRjReL3IOGGoS=m7HtUzeb$iT3i6~qGo%u}@%

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
index ad9f2e58321..e9a7df0feba 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
@@ -109,8 +109,7 @@ public class ManagedBuildTestHelper {
 				}
 			};
 			NullProgressMonitor monitor = new NullProgressMonitor();
-			// TODO: Why is this necessary?
-			//workspace.run(runnable, root, IWorkspace.AVOID_UPDATE, monitor);
+			workspace.run(runnable, root, IWorkspace.AVOID_UPDATE, monitor);
 			project = newProjectHandle;
 		}