From 919e0b408452764d4094c48b2e8d42ba3ff9278f Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Sat, 2 Dec 2023 08:04:38 -0500 Subject: [PATCH] GP-2412 added rust-common.gdt to archive ID test --- .../core/datamgr/DataTypeArchiveIDTest.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java index b3d2df1993..a10190f7b8 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java @@ -38,16 +38,15 @@ public class DataTypeArchiveIDTest extends AbstractGenericTest { private static final String GENERIC_CLIB_64_GDT_PATH = "typeinfo/generic/generic_clib_64.gdt"; private static final String MAC_OS_10_9_GDT_PATH = "typeinfo/mac_10.9/mac_osx.gdt"; - private static final Map archiveIdMap = Map.of( - WIN_VS12_32_GDT_PATH, "2644092282468053077", - WIN_VS12_64_GDT_PATH, "3193696833254024484", - GENERIC_CLIB_32_GDT_PATH, "2644097909188870631", - GENERIC_CLIB_64_GDT_PATH, "3193699959493190971", - MAC_OS_10_9_GDT_PATH, "2650667045259492112", - "typeinfo/golang/golang_1.17_anybit_any.gdt", "3533627828569507753", - "typeinfo/golang/golang_1.18_anybit_any.gdt", "3528902399865061936", - "typeinfo/golang/golang_1.19_anybit_any.gdt", "3533812166493410774", - "typeinfo/golang/golang_1.20_anybit_any.gdt", "3533817003441909616"); + private static final Map archiveIdMap = + Map.of(WIN_VS12_32_GDT_PATH, "2644092282468053077", WIN_VS12_64_GDT_PATH, + "3193696833254024484", GENERIC_CLIB_32_GDT_PATH, "2644097909188870631", + GENERIC_CLIB_64_GDT_PATH, "3193699959493190971", MAC_OS_10_9_GDT_PATH, + "2650667045259492112", "typeinfo/golang/golang_1.17_anybit_any.gdt", + "3533627828569507753", "typeinfo/golang/golang_1.18_anybit_any.gdt", + "3528902399865061936", "typeinfo/golang/golang_1.19_anybit_any.gdt", + "3533812166493410774", "typeinfo/golang/golang_1.20_anybit_any.gdt", + "3533817003441909616", "typeinfo/rust/rust-common.gdt", "3557867258392862055"); private Map getCurrentGdts() { return Application.findFilesByExtensionInApplication(".gdt") @@ -134,7 +133,6 @@ public class DataTypeArchiveIDTest extends AbstractGenericTest { } } - @Test public void spotCheckWindowsVS12_64() throws IOException { ResourceFile gdtFile = Application.getModuleDataFile(WIN_VS12_64_GDT_PATH);