Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 14:57:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GT-3062: code review fixes (closes #875)

Browse Source
This commit is contained in:
adamopolous
2019-08-06 16:45:18 -04:00
parent 54f61b03c5
commit aee9b170eb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Test/IntegrationTest/build.gradle
+2 -4
View File
@@ -8,8 +8,6 @@ eclipse.project.name = '_Integration Test'
* Build dependencies * Build dependencies
*********************************************************************************/ *********************************************************************************/
dependencies { dependencies {
// integration test module may depends on all other projects within this repo
def ghidraPath = projectDir.getParentFile().getParentFile().path.replace(File.separator, "/") + "/";
rootProject.subprojects { p -> rootProject.subprojects { p ->
p.plugins.withType(JavaPlugin) { p.plugins.withType(JavaPlugin) {
@@ -29,8 +27,8 @@ dependencies {
// some tests use classes in Base/src/test and test.slow // some tests use classes in Base/src/test and test.slow
testCompile project(path: ':Base', configuration: 'testArtifacts') testCompile project(path: ':Base', configuration: 'testArtifacts')
compile project(path: ':Base', configuration: 'integrationTestArtifacts') testCompile project(path: ':Base', configuration: 'integrationTestArtifacts')
compile project(path: ':FunctionGraph', configuration: 'testArtifacts') testCompile project(path: ':FunctionGraph', configuration: 'testArtifacts')
} }
// For Java 9, we must explicitly export references to the internal classes we are using. // For Java 9, we must explicitly export references to the internal classes we are using.
gradle/javaProject.gradle
+3
View File
@@ -79,6 +79,9 @@ sourceSets {
screenShots { screenShots {
java { java {
srcDir 'src/screen/java' srcDir 'src/screen/java'
// Screenshots are essentially tests, and depend on classes in several other
// test directories so they must be included here
compileClasspath += main.output + test.output + integrationTest.output compileClasspath += main.output + test.output + integrationTest.output
runtimeClasspath += main.output + test.output + integrationTest.output runtimeClasspath += main.output + test.output + integrationTest.output
} }