# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1263845217 21600
# Node ID ce19c6e825a9550893e093b63a9e3c2bb78bf569
# Parent  a4131d1d5bfa099dda6cc5e74e110c304bfc5e23# Parent  0384a72364f6cfecc8d1fe84519e3372fbe79487
head merge

diff -r a4131d1d5bfa -r ce19c6e825a9 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Mon Jan 18 14:05:55 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Mon Jan 18 14:06:57 2010 -0600
@@ -1938,6 +1938,11 @@
 
 	protected boolean runMMPChangeCheck(final ICarbideBuildConfiguration buildConfig, IPath componentPath, boolean isTest, final CarbideCommandLauncher launcher) {
 
+		// don't worry about it for tests
+		if (WorkbenchUtils.isJUnitRunning()) {
+			return true;
+		}
+		
 		// ignore this for Qt projects since the mmp will be regenerated before each build.
 		final IProject project = buildConfig.getCarbideProject().getProject();
 		try {
@@ -1973,6 +1978,11 @@
 	
 	protected boolean runMMPChangeCheck(final ICarbideBuildConfiguration buildConfig, List<IPath> normalMakMakePaths, List<IPath> testMakMakePaths, final CarbideCommandLauncher launcher) {
 
+		// don't worry about it for tests
+		if (WorkbenchUtils.isJUnitRunning()) {
+			return true;
+		}
+		
 		// ignore this for Qt projects since the mmp will be regenerated before each build.
 		final IProject project = buildConfig.getCarbideProject().getProject();
 		try {