mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-24 06:21:29 -04:00
parent dc3990d413 2d416f1071
commit bdbdf4eea1
49 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/GhidraScriptMgrPluginScreenShots.java
View File

@@ -35,7 +35,6 @@ import ghidra.app.plugin.core.osgi.BundleStatusComponentProvider;
import ghidra.app.plugin.core.script.*;
import ghidra.app.script.*;
import ghidra.app.services.ConsoleService;
import ghidra.jython.JythonScriptProvider;
import ghidra.util.HelpLocation;
import ghidra.util.datastruct.LRUSet;
@@ -223,7 +222,7 @@ public class GhidraScriptMgrPluginScreenShots extends GhidraScreenShotGenerator
List<GhidraScriptProvider> items = new ArrayList<>();
JavaScriptProvider javaScriptProvider = new JavaScriptProvider();
items.add(javaScriptProvider);
items.add(new JythonScriptProvider());
//items.add(new JythonScriptProvider());
final PickProviderDialog pickDialog = new PickProviderDialog(items, javaScriptProvider);
runSwing(() -> tool.showDialog(pickDialog), false);

3
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/database/sourcemap/MappingSourceFilesTest.java
View File

@@ -22,7 +22,8 @@ import java.util.HexFormat;
import java.util.List;
import org.junit.Test;
import org.python.google.common.primitives.Longs;
import com.google.common.primitives.Longs;
import ghidra.framework.store.LockException;
import ghidra.program.model.address.*;

3
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/database/sourcemap/SourceFileTest.java
View File

@@ -24,7 +24,8 @@ import java.util.*;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.python.google.common.primitives.Longs;
import com.google.common.primitives.Longs;
import ghidra.framework.store.LockException;
import ghidra.util.SourceFileUtils;

3
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/database/sourcemap/UserDataPathTransformerTest.java
View File

@@ -22,7 +22,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.python.google.common.primitives.Longs;
import com.google.common.primitives.Longs;
import generic.test.AbstractGenericTest;
import ghidra.framework.store.LockException;