From acc84d2524c5e0d62638c165590bbe7b417802bb Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 20 Dec 2017 18:42:09 +0100
Subject: [PATCH] Rollback incorrect tests fix

---
 ultimate/build.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 30017fa3897..7660627ac1b 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -115,7 +115,10 @@ val preparedResources = File(buildDir, "prepResources")
 
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
+    "test" {
+        projectDefault()
+        resources.srcDir(preparedResources)
+    }
 }
 
 val ultimatePluginXmlContent: String by lazy {
@@ -181,7 +184,7 @@ projectTest {
     dependsOn(preparePluginXml)
     workingDir = rootDir
     doFirst {
-        classpath.add(files(preparedResources))
+        systemProperty("idea.home.path", intellijRootDir().canonicalPath)
         systemProperty("spring.classpath", springClasspath.asPath)
     }
 }