[projmgr] Update tests

Open-CMSIS-Pack · Sep 6, 2024 · 4983300 · 4983300
1 parent 1f8555d
commit 4983300
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/tools/projmgr/test/data/TestMemoryRegions/pack/BSP/ARM.RteTest_BSP.pdsc b/tools/projmgr/test/data/TestMemoryRegions/pack/BSP/ARM.RteTest_BSP.pdsc
@@ -22,18 +22,18 @@
     <board name="RteTestBoard0" vendor="Keil" revision="1.1.1">
       <description>TestBoard with dots in the name and memory</description>
       <mountedDevice deviceIndex="0" Dvendor="ARM:82" Dname="RteTestDevice0"/>
-      <memory name="Flash-External0" access="rx"  start="0x10040000" size="0x04000000" default="1"/>
-      <memory name="RAM-External0"   access="rwx" start="0x10020000" size="0x00800000" default="1"/>
-      <memory name="Flash-External1" access="rx"  start="0x90000000" size="0x04000000" default="1"/>
-      <memory name="RAM-External1"   access="rwx" start="0x90000000" size="0x00800000" default="1"/>
+      <memory name="Flash-External0" access="rx"  start="0x70000000" size="0x04000000" default="1"/>
+      <memory name="RAM-External0"   access="rwx" start="0x60000000" size="0x00800000" default="1"/>
+      <memory name="Flash-External1" access="rx"  start="0x71000000" size="0x04000000" default="1"/>
+      <memory name="RAM-External1"   access="rwx" start="0x61000000" size="0x00800000" default="1"/>
     </board>
     <board name="RteTestBoard1" vendor="Keil" revision="2.2.2">
       <description>TestBoard with dots in the name and memory</description>
       <mountedDevice deviceIndex="0" Dvendor="ARM:82" Dname="RteTestDevice1"/>
-      <memory name="Flash-External0" access="rx"  start="0x10040000" size="0x04000000" default="1"/>
-      <memory name="RAM-External0"   access="rwx" start="0x10020000" size="0x00800000" default="1"/>
-      <memory name="Flash-External1" access="rx"  start="0x90000000" size="0x04000000" default="1"/>
-      <memory name="RAM-External1"   access="rwx" start="0x90000000" size="0x00800000" default="1"/>
+      <memory name="Flash-External0" access="rx"  start="0x70000000" size="0x04000000" default="1"/>
+      <memory name="RAM-External0"   access="rwx" start="0x60000000" size="0x00800000" default="1"/>
+      <memory name="Flash-External1" access="rx"  start="0x71000000" size="0x04000000" default="1"/>
+      <memory name="RAM-External1"   access="rwx" start="0x61000000" size="0x00800000" default="1"/>
     </board>  
   </boards>
 

diff --git a/tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice0/regions_RteTestBoard0.h b/tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice0/regions_RteTestBoard0.h
@@ -100,10 +100,10 @@
 
 // <n> Resources that are not allocated to linker regions
 // <i> rx ROM:   Default0_Region from DFP:  BASE: 0x10000000  SIZE: 0x00040000
-// <i> rx ROM:   Flash-External0 from BSP:  BASE: 0x10040000  SIZE: 0x04000000
-// <i> rwx RAM:  RAM-External0 from BSP:    BASE: 0x10020000  SIZE: 0x00800000
-// <i> rx ROM:   Flash-External1 from BSP:  BASE: 0x90000000  SIZE: 0x04000000
-// <i> rwx RAM:  RAM-External1 from BSP:    BASE: 0x90000000  SIZE: 0x00800000
+// <i> rx ROM:   Flash-External0 from BSP:  BASE: 0x70000000  SIZE: 0x04000000
+// <i> rwx RAM:  RAM-External0 from BSP:    BASE: 0x60000000  SIZE: 0x00800000
+// <i> rx ROM:   Flash-External1 from BSP:  BASE: 0x71000000  SIZE: 0x04000000
+// <i> rwx RAM:  RAM-External1 from BSP:    BASE: 0x61000000  SIZE: 0x00800000
 
 
 #endif /* REGIONS_RTETESTBOARD0_H */
diff --git a/tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice1/regions_RteTestBoard1.h b/tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice1/regions_RteTestBoard1.h
@@ -23,17 +23,17 @@
 
 // <h> __ROM1 (is rx memory: Flash-External0 from BSP)
 //   <o> Base address <0x0-0xFFFFFFFF:8>
-//   <i> Defines base address of memory region. Default: 0x10040000
-#define __ROM1_BASE 0x10040000
+//   <i> Defines base address of memory region. Default: 0x70000000
+#define __ROM1_BASE 0x70000000
 //   <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
 //   <i> Defines size of memory region. Default: 0x04000000
 #define __ROM1_SIZE 0x04000000
 // </h>
 
 // <h> __ROM2 (is rx memory: Flash-External1 from BSP)
 //   <o> Base address <0x0-0xFFFFFFFF:8>
-//   <i> Defines base address of memory region. Default: 0x90000000
-#define __ROM2_BASE 0x90000000
+//   <i> Defines base address of memory region. Default: 0x71000000
+#define __ROM2_BASE 0x71000000
 //   <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
 //   <i> Defines size of memory region. Default: 0x04000000
 #define __ROM2_SIZE 0x04000000
@@ -64,17 +64,17 @@
 
 // <h> __RAM1 (is rwx memory: RAM-External0 from BSP)
 //   <o> Base address <0x0-0xFFFFFFFF:8>
-//   <i> Defines base address of memory region. Default: 0x10020000
-#define __RAM1_BASE 0x10020000
+//   <i> Defines base address of memory region. Default: 0x60000000
+#define __RAM1_BASE 0x60000000
 //   <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
 //   <i> Defines size of memory region. Default: 0x00800000
 #define __RAM1_SIZE 0x00800000
 // </h>
 
 // <h> __RAM2 (is rwx memory: RAM-External1 from BSP)
 //   <o> Base address <0x0-0xFFFFFFFF:8>
-//   <i> Defines base address of memory region. Default: 0x90000000
-#define __RAM2_BASE 0x90000000
+//   <i> Defines base address of memory region. Default: 0x61000000
+#define __RAM2_BASE 0x61000000
 //   <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
 //   <i> Defines size of memory region. Default: 0x00800000
 #define __RAM2_SIZE 0x00800000

diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp
@@ -6274,7 +6274,6 @@ TEST_F(ProjMgrUnitTests, ConfigFilesUpdate) {
 }
 
 TEST_F(ProjMgrUnitTests, RegionsFileGeneration) {
-  //StdStreamRedirect streamRedirect;
   char* argv[3];
   const string& csolution = testinput_folder + "/TestMemoryRegions/regions.csolution.yml";
   argv[1] = (char*)"convert";