# HG changeset patch # User wpaul # Date 1263844708 21600 # Node ID 0384a72364f6cfecc8d1fe84519e3372fbe79487 # Parent 54a289b8cadf71582457c4fc6e75bd4ef2368917 don't show mmp changed dialog when junit tests are running. diff -r 54a289b8cadf -r 0384a72364f6 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 12:04:50 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Mon Jan 18 13:58:28 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 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(); try {