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

Merge remote-tracking branch 'origin/GP-1164_ryanmkurtz_XDG--SQUASHED'

Browse source 
(Closes #908)
This commit is contained in:
Ryan Kurtz 2023-12-19 16:08:24 -05:00
commit 3b0aac92d0
50 changed files with 919 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/FrontEndPluginScreenShots.java
View file

@ -35,6 +35,7 @@ import docking.wizard.WizardManager;
import docking.wizard.WizardPanel;
import generic.theme.GThemeDefaults.Colors;
import ghidra.app.plugin.core.archive.RestoreDialog;
import ghidra.framework.Application;
import ghidra.framework.data.DefaultProjectData;
import ghidra.framework.data.GhidraFileData;
import ghidra.framework.main.*;
@ -56,7 +57,6 @@ import resources.MultiIcon;
public class FrontEndPluginScreenShots extends GhidraScreenShotGenerator {
private static final String OTHER_PROJECT = "Other_Project";
private final static String TEMP_DIR = System.getProperty("java.io.tmpdir");
Icon icon = (Icon) getInstanceField("CONVERT_ICON", ProjectInfoDialog.class);
public FrontEndPluginScreenShots() {
@ -659,6 +659,7 @@ public class FrontEndPluginScreenShots extends GhidraScreenShotGenerator {
@Test
public void testViewOtherProjects()
throws IOException, LockException, InvalidNameException, CancelledException {
String TEMP_DIR = Application.getUserTempDirectory().getAbsolutePath();
Project project = env.getProject();
program = env.getProgram("WinHelloCPP.exe");
@ -692,6 +693,7 @@ public class FrontEndPluginScreenShots extends GhidraScreenShotGenerator {
@Test
public void testLinkOtherProject()
throws IOException, LockException, InvalidNameException, CancelledException {
String TEMP_DIR = Application.getUserTempDirectory().getAbsolutePath();
Project project = env.getProject();
program = env.getProgram("WinHelloCPP.exe");

3
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
View file

@ -30,6 +30,7 @@ import javax.rmi.ssl.SslRMIClientSocketFactory;
import org.apache.commons.lang3.RandomStringUtils;
import generic.test.*;
import ghidra.framework.Application;
import ghidra.framework.client.*;
import ghidra.framework.data.ContentHandler;
import ghidra.framework.data.DomainObjectAdapter;
@ -347,7 +348,7 @@ public class ServerTestUtil {
private static synchronized File getPkiTestDirectory() {
if (testPkiDirectory == null) {
testPkiDirectory = new File(System.getProperty("java.io.tmpdir"), "test-pki");
testPkiDirectory = new File(Application.getUserTempDirectory(), "test-pki");
FileUtilities.deleteDir(testPkiDirectory);
testPkiDirectory.mkdirs();