yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Finding external modules from the classpath instead of the

Browse source 
eclipse.project.dir property.
This commit is contained in:
Ryan Kurtz 2019-08-09 13:49:53 -04:00
parent 351cf56e6e
commit 3a12b5bbe2
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java
View file

@ -933,18 +933,6 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
ResourceFile myModuleRootDirectory =
Application.getModuleContainingClass(getClass().getName());
if (myModuleRootDirectory == null) {
if (!SystemUtilities.isInDevelopmentMode()) {
Msg.warn(this, "Unable to identify pcodetest module directory!\n" +
"Project must contain Module.manifest file, and if developing module using Eclipse\n" +
"w/ GhidraDev the VM argument -Declipse.project.dir=<project-path> must be specified.");
}
else {
Msg.warn(this,
"Unable to identify pcodetest module directory! Project must contain Module.manifest file");
}
}
if (myModuleRootDirectory != null) {
File myModuleRoot = myModuleRootDirectory.getFile(false);
if (myModuleRoot != null) {
@ -954,6 +942,10 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
}
}
}
else {
Msg.warn(this,
"Unable to identify pcodetest module directory! Project must contain Module.manifest file");
}
if (resourcesTestDataDir == null || !resourcesTestDataDir.isDirectory()) {
findTestResourceDirectory(DEFAULT_PROCESSOR_TEST_MODULE);