From 67e074b9231f6bc6fbf1f8f16669b92b7a82bb3d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 4 Nov 2016 16:19:54 +0100
Subject: [PATCH] =?UTF-8?q?fix=20test=20data=20=E2=80=94=20remove=20inheri?=
 =?UTF-8?q?t-compiler-output=3D"false"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/intellij/roots/ModuleRootsExternalizationTest.java    | 4 ++--
 jps/model-serialization/testData/sampleProject/xxx/xxx.iml    | 2 +-
 plugins/eclipse/testData/iml/allProps/expected/expected.iml   | 2 +-
 .../eclipse/testData/iml/relativePaths/expected/expected.iml  | 2 +-
 .../testData/iml/resolvedVariables/expected/expected.iml      | 2 +-
 samples/comparingReferences/comparingReferences.iml           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java
index 9a026e2b702f..a7a6168ae2f3 100644
--- a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase {
     final Element element = new Element("root");
     moduleRootManager.getState().writeExternal(element);
     assertElementEquals(element,
-                        "<root inherit-compiler-output=\"false\">" +
+                        "<root>" +
                         "<output url=\"file://$MODULE_DIR$/classes\" />" +
                         "<output-test url=\"file://$MODULE_DIR$/testClasses\" />" +
                         "<exclude-output />" +
diff --git a/jps/model-serialization/testData/sampleProject/xxx/xxx.iml b/jps/model-serialization/testData/sampleProject/xxx/xxx.iml
index 36d6b2fa62ee..e3b97492c317 100644
--- a/jps/model-serialization/testData/sampleProject/xxx/xxx.iml
+++ b/jps/model-serialization/testData/sampleProject/xxx/xxx.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/output" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/plugins/eclipse/testData/iml/allProps/expected/expected.iml b/plugins/eclipse/testData/iml/allProps/expected/expected.iml
index dfd2fa8ea05d..ac74a31bb93a 100644
--- a/plugins/eclipse/testData/iml/allProps/expected/expected.iml
+++ b/plugins/eclipse/testData/iml/allProps/expected/expected.iml
@@ -1,4 +1,4 @@
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/bin" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
diff --git a/plugins/eclipse/testData/iml/relativePaths/expected/expected.iml b/plugins/eclipse/testData/iml/relativePaths/expected/expected.iml
index 6e006e747e6a..491f50994554 100644
--- a/plugins/eclipse/testData/iml/relativePaths/expected/expected.iml
+++ b/plugins/eclipse/testData/iml/relativePaths/expected/expected.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
diff --git a/plugins/eclipse/testData/iml/resolvedVariables/expected/expected.iml b/plugins/eclipse/testData/iml/resolvedVariables/expected/expected.iml
index 0eced5ed6f50..1e8c41aa7395 100644
--- a/plugins/eclipse/testData/iml/resolvedVariables/expected/expected.iml
+++ b/plugins/eclipse/testData/iml/resolvedVariables/expected/expected.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
diff --git a/samples/comparingReferences/comparingReferences.iml b/samples/comparingReferences/comparingReferences.iml
index f38326667e00..5e68b3e27959 100644
--- a/samples/comparingReferences/comparingReferences.iml
+++ b/samples/comparingReferences/comparingReferences.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/source/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">