# HG changeset patch # User wpaul # Date 1263510015 21600 # Node ID b31077a6aa47dbe64d17a2abdddadafa44d813bf # Parent 67c35e64c1c9cb0bd2b135a081fd9f6c1d0a0be7 don't show mmp changed dialog when junit tests are running. diff -r 67c35e64c1c9 -r b31077a6aa47 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 Thu Jan 14 09:14:44 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Thu Jan 14 17:00:15 2010 -0600 @@ -1937,6 +1937,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(); if (QtCorePlugin.isQtProject(project)) { @@ -1968,6 +1973,11 @@ protected boolean runMMPChangeCheck(final ICarbideBuildConfiguration buildConfig, List normalMakMakePaths, List 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(); if (QtCorePlugin.isQtProject(project)) {