From 0f33a90bad7641a672e24f7c1fb1eebc97e2ece9 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 6 Aug 2019 14:13:15 -0400 Subject: [PATCH] Fixing Integration Test build when top-level source directory is not named "ghidra" (fixes #876). --- Ghidra/Test/IntegrationTest/build.gradle | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Ghidra/Test/IntegrationTest/build.gradle b/Ghidra/Test/IntegrationTest/build.gradle index f962f11fc3..4d2103b21f 100644 --- a/Ghidra/Test/IntegrationTest/build.gradle +++ b/Ghidra/Test/IntegrationTest/build.gradle @@ -14,19 +14,16 @@ dependencies { rootProject.subprojects { p -> p.plugins.withType(JavaPlugin) { def projectPath = p.projectDir.path.replace(File.separator, "/") - if (projectPath.contains("ghidra/Ghidra")) { - if (projectPath.contains("/Framework/") || - projectPath.contains("/Features/") || - projectPath.contains("/Processors/")) { - - compile p - } + if (projectPath.startsWith(ghidraPath) && ( + projectPath.contains("/Framework/") || + projectPath.contains("/Features/") || + projectPath.contains("/Processors/"))) { + + compile p } } } - - // some tests use classes in Base/src/test and test.slow testCompile project(path: ':Base', configuration: 'testArtifacts') }