From 64ac2238952e73c9cbf72ec8a3254c8ef2e45990 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 5 Mar 2014 20:09:48 +0400 Subject: [PATCH] Move DebugProtoBuf to module "compiler-tests" To help debug serialization-related code in compiler tests --- .../jet/descriptors/serialization/DebugJavaProtoBuf.java | 0 .../jet/descriptors/serialization/DebugProtoBuf.java | 0 .../jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt | 7 ++++--- jps-plugin/jps-plugin.iml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) rename {jps-plugin/test => compiler/tests}/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java (100%) rename {jps-plugin/test => compiler/tests}/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java (100%) diff --git a/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java similarity index 100% rename from jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java rename to compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java diff --git a/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java similarity index 100% rename from jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java rename to compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java diff --git a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt index 1e79b8ceabf..c5869f2192e 100644 --- a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt +++ b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt @@ -42,9 +42,10 @@ fun main(args: Array) { execProtoc(commonProto, "compiler/frontend/serialization/src") execProtoc(javaProto, "core/serialization.java/src") - modifyAndExecProtoc(commonProto, "jps-plugin/test") - modifyAndExecProtoc(javaProto, "jps-plugin/test") - } finally { + modifyAndExecProtoc(commonProto, "compiler/tests") + modifyAndExecProtoc(javaProto, "compiler/tests") + } + finally { // Workaround for JVM hanging: IDEA's process handler creates thread pool System.exit(0) } diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml index 4f321f16eb3..37590a836e4 100644 --- a/jps-plugin/jps-plugin.iml +++ b/jps-plugin/jps-plugin.iml @@ -16,6 +16,7 @@ +