From bf40e70a514a602ad59b40282b90eae4b076f002 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 14 Feb 2011 11:54:24 +0100
Subject: [PATCH] more logging for compiler tests

---
 .../src/com/intellij/compiler/impl/CompileDriver.java  |  2 +-
 .../impl/javaCompiler/CompilerParsingThread.java       |  6 +++++-
 .../compiler/impl/javaCompiler/JavaCompiler.java       | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 54ffe8819f26..dcae2c40fe62 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -92,7 +92,7 @@ import java.util.*;
 public class CompileDriver {
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver");
   // to be used in tests only for debug output
-  public static boolean ourDebugMode = false;
+  public static volatile boolean ourDebugMode = false;
 
   private final Project myProject;
   private final Map<Pair<IntermediateOutputCompiler, Module>, Pair<VirtualFile, VirtualFile>> myGenerationCompilerModuleToOutputDirMap; // [IntermediateOutputCompiler, Module] -> [ProductionSources, TestSources]
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java
index 2c1fba6db054..58e74794bec9 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java
@@ -16,11 +16,12 @@
 package com.intellij.compiler.impl.javaCompiler;
 
 import com.intellij.compiler.OutputParser;
+import com.intellij.compiler.impl.CompileDriver;
 import com.intellij.compiler.make.CacheCorruptedException;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompilerMessageCategory;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.util.SpinAllocator;
 import com.intellij.util.StringBuilderSpinAllocator;
 import org.jetbrains.annotations.NonNls;
@@ -107,6 +108,9 @@ public class CompilerParsingThread implements Runnable, OutputParser.Callback {
     if (LOG.isDebugEnabled()) {
       LOG.debug("LIne read: #" + line + "#");
     }
+    if (CompileDriver.ourDebugMode) {
+      System.out.println("LIne read: #" + line + "#");
+    }
     if (TERMINATION_STRING.equals(line)) {
       myLastReadLine = null;
     }
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
index 8384fbc0bb18..827c8135b622 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
@@ -24,6 +24,7 @@ package com.intellij.compiler.impl.javaCompiler;
 import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.CompilerConfigurationImpl;
 import com.intellij.compiler.CompilerException;
+import com.intellij.compiler.impl.CompileDriver;
 import com.intellij.compiler.make.CacheCorruptedException;
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.compiler.ex.CompileContextEx;
@@ -61,13 +62,22 @@ public class JavaCompiler implements TranslatingCompiler {
     final BackendCompiler backEndCompiler = getBackEndCompiler();
     final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(moduleChunk, myProject, Arrays.asList(files), (CompileContextEx)context, backEndCompiler, sink);
     try {
+      if (CompileDriver.ourDebugMode) {
+        System.out.println("Starting java compiler; with backend compiler: " + backEndCompiler.getClass().getName());
+      }
       wrapper.compile();
     }
     catch (CompilerException e) {
+      if (CompileDriver.ourDebugMode) {
+        e.printStackTrace();
+      }
       context.addMessage(CompilerMessageCategory.ERROR, e.getMessage(), null, -1, -1);
       LOG.info(e);
     }
     catch (CacheCorruptedException e) {
+      if (CompileDriver.ourDebugMode) {
+        e.printStackTrace();
+      }
       LOG.info(e);
       context.requestRebuildNextTime(e.getMessage());
     }