Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 14:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test timing fixes

Browse Source
This commit is contained in:
dragonmacher 2024-06-13 18:38:06 -04:00
parent 0475071f52
commit e18c80f20a
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/test/AbstractProgramBasedTest.java
View File

@ -176,6 +176,8 @@ public abstract class AbstractProgramBasedTest extends AbstractGhidraHeadedInteg
int tx = program.startTransaction("Test");
try {
callback.accept(program);
program.flushEvents();
waitForSwing();
commit = true;
}
catch (Exception e) {
@ -201,6 +203,8 @@ public abstract class AbstractProgramBasedTest extends AbstractGhidraHeadedInteg
int tx = program.startTransaction("Test");
try {
result = f.apply(program);
program.flushEvents();
waitForSwing();
commit = true;
}
catch (Exception e) {

32
Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/HighSymbolTest.java
View File

@ -49,29 +49,19 @@ public class HighSymbolTest extends AbstractDecompilerTest {
private void renameGlobalVariable(HighSymbol highSymbol, ClangToken tokenAtCursor,
String newName) {
Address addr = highSymbol.getStorage().getMinAddress();
RenameLabelCmd cmd =
new RenameLabelCmd(addr, highSymbol.getName(), newName, SourceType.USER_DEFINED);
modifyProgram(p -> {
cmd.applyTo(highSymbol.getProgram());
});
applyCmd(program,
new RenameLabelCmd(addr, highSymbol.getName(), newName, SourceType.USER_DEFINED));
waitForDecompiler();
}
private void deleteFunction(String address) {
modifyProgram(p -> {
Address addr = p.getAddressFactory().getAddress(address);
DeleteFunctionCmd deleteCmd = new DeleteFunctionCmd(addr);
deleteCmd.applyTo(p);
});
Address addr = program.getAddressFactory().getAddress(address);
applyCmd(program, new DeleteFunctionCmd(addr));
}
private void createFunction(String address) {
modifyProgram(p -> {
Address addr = p.getAddressFactory().getAddress(address);
CreateFunctionCmd createCmd = new CreateFunctionCmd(addr);
createCmd.applyTo(p);
});
Address addr = program.getAddressFactory().getAddress(address);
applyCmd(program, new CreateFunctionCmd(addr));
}
private void turnOffAnalysis() {
@ -103,10 +93,7 @@ public class HighSymbolTest extends AbstractDecompilerTest {
}
private void applyEquate(String equateName, Address addr, long equateValue) {
modifyProgram(p -> {
SetEquateCmd cmd = new SetEquateCmd(equateName, addr, 0, equateValue);
cmd.applyTo(program);
});
applyCmd(program, new SetEquateCmd(equateName, addr, 0, equateValue));
}
private void renameExisting(HighSymbol highSymbol, ClangToken tokenAtCursor, String newName) {
@ -324,21 +311,26 @@ public class HighSymbolTest extends AbstractDecompilerTest {
turnOffAnalysis();
createFunction("10015a6");
decompile("10015a6");
ClangTextField line = getLineContaining("param_4 +");
FieldLocation loc = loc(line.getLineNumber(), 23);
ClangToken token = line.getToken(loc);
assertTrue(token instanceof ClangVariableToken);
HighSymbol highSymbol = token.getHighVariable().getSymbol();
renameVariable(highSymbol, token, "newParam");
line = getLineContaining("newParam +");
token = line.getToken(loc);
assertTrue(token instanceof ClangVariableToken);
HighVariable variable = token.getHighVariable();
assertTrue(variable instanceof HighParam);
assertEquals(((HighParam) variable).getSlot(), 3);
highSymbol = variable.getSymbol();
assertTrue(highSymbol.isNameLocked());
assertFalse(highSymbol.isTypeLocked());
Function function = highSymbol.getHighFunction().getFunction();
Parameter[] parameters = function.getParameters();
assertEquals(parameters.length, 4);