# HG changeset patch # User wpaul # Date 1264629966 21600 # Node ID 127ab3f4006e8c6b99e49b9c60fcd3e6c8ba3546 # Parent abb91251bab6bb7561971e802725b29b74522153 don't show question dialog when junit is running diff -r abb91251bab6 -r 127ab3f4006e 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 Wed Jan 27 11:05:22 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Wed Jan 27 16:06:06 2010 -0600 @@ -2460,7 +2460,7 @@ final IPreferenceStore prefsStore = CarbideBuilderPlugin.getDefault().getPreferenceStore(); if (prefsStore.getBoolean(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH) == false && - areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile)) { + areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile) && !WorkbenchUtils.isJUnitRunning()) { // if they are not then the user must have been building from the command line. this means that // any dependency files that exist could be stale so we need to delete them. we also need to