Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-12 13:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-debug-image-location' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2022-05-13 14:03:10 -04:00
commit e3a751ca46
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
View File

@ -240,9 +240,9 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
//
// This test is verifying a hack that was put in to fix the difference in 'Alt' key handling
// on Windows (https://bugs.openjdk.java.net/browse/JDK-8194873).
// Create an action and set the keybinding to use the 'Alt' modifier.
// Verify that the action will also get mapped to the 'Alt Graph' modifier.
// on Windows (https://bugs.openjdk.java.net/browse/JDK-8194873).
// Create an action and set the keybinding to use the 'Alt' modifier.
// Verify that the action will also get mapped to the 'Alt Graph' modifier.
//
// verify that no action is mapped to the new binding
@ -335,14 +335,11 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
setUpDialog();
selectRowForAction(action1);
capture(panel, "pre.keystroke.change");
KeyStroke validKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_DOWN_MASK);
triggerActionKey(keyField, InputEvent.CTRL_DOWN_MASK, validKeyStroke.getKeyCode());
assertEquals(KeyEntryTextField.parseKeyStroke(validKeyStroke), keyField.getText());
capture(panel, "post.keystroke.change");
apply();
capture(panel, "post.keystroke.apply");
assertEquals(validKeyStroke, getKeyStroke(action1));
// try again to set a reserved binding

13
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
View File

@ -1795,14 +1795,17 @@ public abstract class AbstractGenericTest extends AbstractGTest {
// ghidra.test.property.report.dir
// Possible Values:
// server: {share dir}/junits.new/JunitTest_version/reports
// local gradle: {user home}/git/{repo}/ghidra/build/JUnit/reports
// eclipse: {module}/bin/
// server {share dir}/reports/{type}/{branch}/{date}/
// local gradle: {repo}/Ghidra/{module}/build/JUnit/reports
// eclipse: {repo}/Ghidra/{module}/bin/
// build: unsupported
// we add to the above directory a single dir value of 'debug'
String debugDirName = "debug";
String dirPath = System.getProperty(GHIDRA_TEST_PROPERTY_REPORT_DIR);
if (dirPath != null) { // running from gradle
debugDirectory = new File(dirPath);
debugDirectory = new File(dirPath, debugDirName);
}
else { // running from Eclipse
@ -1810,7 +1813,7 @@ public abstract class AbstractGenericTest extends AbstractGTest {
// reports, nor do we have a build directory. 'bin' is the closest thing to that.
ResourceFile moduleDir = Application.getMyModuleRootDirectory();
ResourceFile binDir = new ResourceFile(moduleDir, "bin");
debugDirectory = binDir.getFile(false);
debugDirectory = new File(binDir.getFile(false), debugDirName);
}
return debugDirectory;