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

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-6-17-25'

Browse source
This commit is contained in:
Ryan Kurtz 2025-06-18 06:24:10 -04:00
commit 8c48d9f116
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/field/XrefViewerTest.java
View file

@ -181,7 +181,10 @@ public class XrefViewerTest extends AbstractGhidraHeadedIntegrationTest {
selectRow(table, 0); selectRow(table, 0);
assertTrue(runSwing(() -> deleteAction.isEnabled())); assertTrue(runSwing(() -> deleteAction.isEnabled()));
performAction(deleteAction, table, true); performAction(deleteAction, table, false);
DialogComponentProvider dialog = waitForDialogComponent("Delete Xrefs?");
pressButtonByText(dialog, "Delete");
waitForTableModel(table.getModel());
assertEquals(0, table.getModel().getRowCount()); assertEquals(0, table.getModel().getRowCount());
assertReference("01001009", "01001005", false); assertReference("01001009", "01001005", false);

6
Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java
View file

@ -92,7 +92,6 @@ public class ConcurrentTestExceptionStatement extends Statement {
} }
private boolean isRunningFromEclipse() { private boolean isRunningFromEclipse() {
// TODO: this may need adjustment for other Eclipse platforms/versions
return System.getProperty("java.class.path").endsWith(".cp"); return System.getProperty("java.class.path").endsWith(".cp");
} }
@ -195,7 +194,6 @@ public class ConcurrentTestExceptionStatement extends Statement {
} }
} }
@SuppressWarnings({ "removal" }) // Thread.stop()
private void checkForTestTimeout(TestThread testThread) { private void checkForTestTimeout(TestThread testThread) {
if (timoutMonitor == null || !timoutMonitor.didRun()) { if (timoutMonitor == null || !timoutMonitor.didRun()) {
@ -216,9 +214,7 @@ public class ConcurrentTestExceptionStatement extends Statement {
StackTraceElement[] trace = testThread.getStackTrace(); StackTraceElement[] trace = testThread.getStackTrace();
// if we get here, we are one step away from System.exit(1), so do the testThread.interrupt();
// bad thing and kill the thread
testThread.stop();
lastTestThread = null; // don't try to join lastTestThread = null; // don't try to join
AssertionFailedError error = AssertionFailedError error =
new AssertionFailedError("Test locked-up--aborting! See log for details"); new AssertionFailedError("Test locked-up--aborting! See log for details");