yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Revised pcodetest module test resource mechanism

Browse source
This commit is contained in:
ghidra1 2019-08-06 14:28:10 -04:00
parent 0f33a90bad
commit 06f8a90fc7
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,7 +208,6 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
private TestEnv env; private TestEnv env;
private LogData logData; private LogData logData;
private ResourceFile myModuleRootDirectory;
private Collection<ResourceFile> applicationRootDirectories; private Collection<ResourceFile> applicationRootDirectories;
private File resourcesTestDataDir; private File resourcesTestDataDir;
@ -914,6 +913,9 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
} }
private void findTestResourceDirectory(String relativeModulePath) { private void findTestResourceDirectory(String relativeModulePath) {
if (relativeModulePath == null) {
return;
}
for (ResourceFile appRoot : applicationRootDirectories) { for (ResourceFile appRoot : applicationRootDirectories) {
File moduleRoot = new File(appRoot.getAbsolutePath(), relativeModulePath); File moduleRoot = new File(appRoot.getAbsolutePath(), relativeModulePath);
File dir = new File(moduleRoot, TEST_RESOURCE_PATH); File dir = new File(moduleRoot, TEST_RESOURCE_PATH);
@ -928,25 +930,38 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
protected void setUp() throws Exception { protected void setUp() throws Exception {
env = new TestEnv(); env = new TestEnv();
myModuleRootDirectory = Application.getModuleContainingClass(getClass().getName());
applicationRootDirectories = Application.getApplicationRootDirectories(); applicationRootDirectories = Application.getApplicationRootDirectories();
String relativeModulePath = getRelativeModulePath(); ResourceFile myModuleRootDirectory =
Application.getModuleContainingClass(getClass().getName());
resourcesTestDataDir = new File(myModuleRootDirectory.getFile(true), TEST_RESOURCE_PATH); if (myModuleRootDirectory == null) {
if (SystemUtilities.isInReleaseMode()) {
if (!resourcesTestDataDir.isDirectory()) { Msg.warn(this, "Unable to identify pcodetest module directory!\n" +
findTestResourceDirectory(relativeModulePath); "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");
}
}
String relativeModulePath = null;
File myModuleRoot = myModuleRootDirectory.getFile(false);
if (myModuleRoot != null) {
resourcesTestDataDir = new File(myModuleRoot, TEST_RESOURCE_PATH);
if (!resourcesTestDataDir.isDirectory()) {
relativeModulePath = getRelativeModulePath(myModuleRootDirectory);
findTestResourceDirectory(relativeModulePath);
}
} }
if (!resourcesTestDataDir.isDirectory()) { if (resourcesTestDataDir == null || !resourcesTestDataDir.isDirectory()) {
findTestResourceDirectory(DEFAULT_PROCESSOR_TEST_MODULE); findTestResourceDirectory(DEFAULT_PROCESSOR_TEST_MODULE);
} }
if (!resourcesTestDataDir.isDirectory()) { if (!resourcesTestDataDir.isDirectory()) {
throw new RuntimeException( throw new RuntimeException(
"Failed to locate test resource directory: " + relativeModulePath); "Failed to locate test resource directory: " + TEST_RESOURCE_PATH);
} }
logData = initializeLog(getClass()); logData = initializeLog(getClass());
@ -995,7 +1010,7 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
} }
} }
private String getRelativeModulePath() { private String getRelativeModulePath(ResourceFile myModuleRootDirectory) {
String absolutePath = myModuleRootDirectory.getAbsolutePath(); String absolutePath = myModuleRootDirectory.getAbsolutePath();
for (ResourceFile appRoot : applicationRootDirectories) { for (ResourceFile appRoot : applicationRootDirectories) {
String rootPath = appRoot.getAbsolutePath(); String rootPath = appRoot.getAbsolutePath();
@ -1003,7 +1018,7 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E
return absolutePath.substring(rootPath.length() + 1); return absolutePath.substring(rootPath.length() + 1);
} }
} }
throw new RuntimeException("Failed to resolve relative module path"); return null;
} }
private static class LogData { private static class LogData {