Skip to content

Commit d511cf8

Browse files
committed
tests: update output for reordered support bits
Forgotten in a610f7d Signed-off-by: Brice Goglin <[email protected]>
1 parent a610f7d commit d511cf8

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

tests/hwloc/xml/16-2gr2gr2n2c+misc.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@
128128
<support name="cpubind.get_thisthread_last_cpu_location"/>
129129
<support name="membind.set_thisthread_membind"/>
130130
<support name="membind.get_thisthread_membind"/>
131+
<support name="membind.alloc_membind"/>
131132
<support name="membind.set_area_membind"/>
132133
<support name="membind.get_area_membind"/>
133-
<support name="membind.alloc_membind"/>
134+
<support name="membind.get_area_memlocation"/>
134135
<support name="membind.firsttouch_membind"/>
135136
<support name="membind.bind_membind"/>
136137
<support name="membind.interleave_membind"/>
137138
<support name="membind.migrate_membind"/>
138-
<support name="membind.get_area_memlocation"/>
139139
<support name="custom.exported_support"/>
140140
<info name="Backend" value="Synthetic"/>
141141
<info name="SyntheticDescription" value="group:2 group:2 node:2 core:2 1"/>

tests/hwloc/xml/16amd64-8n2c-cpusets.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<support name="membind.set_thisthread_membind"/>
132132
<support name="membind.get_thisthread_membind"/>
133133
<support name="membind.alloc_membind"/>
134+
<support name="membind.get_area_memlocation"/>
134135
<support name="membind.firsttouch_membind"/>
135136
<support name="membind.bind_membind"/>
136-
<support name="membind.get_area_memlocation"/>
137137
<support name="custom.exported_support"/>
138138
</topology>

tests/hwloc/xml/192em64t-12gr2n8c2t.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,14 +2399,14 @@
23992399
<support name="cpubind.get_thisthread_last_cpu_location"/>
24002400
<support name="membind.set_thisthread_membind"/>
24012401
<support name="membind.get_thisthread_membind"/>
2402+
<support name="membind.alloc_membind"/>
24022403
<support name="membind.set_area_membind"/>
24032404
<support name="membind.get_area_membind"/>
2404-
<support name="membind.alloc_membind"/>
2405+
<support name="membind.get_area_memlocation"/>
24052406
<support name="membind.firsttouch_membind"/>
24062407
<support name="membind.bind_membind"/>
24072408
<support name="membind.interleave_membind"/>
24082409
<support name="membind.migrate_membind"/>
2409-
<support name="membind.get_area_memlocation"/>
24102410
<support name="custom.exported_support"/>
24112411
<info name="Backend" value="Linux"/>
24122412
<info name="LinuxCgroup" value="/"/>

tests/hwloc/xml/power8gpudistances.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@
216216
<support name="cpubind.get_thisthread_last_cpu_location"/>
217217
<support name="membind.set_thisthread_membind"/>
218218
<support name="membind.get_thisthread_membind"/>
219+
<support name="membind.alloc_membind"/>
219220
<support name="membind.set_area_membind"/>
220221
<support name="membind.get_area_membind"/>
221-
<support name="membind.alloc_membind"/>
222+
<support name="membind.get_area_memlocation"/>
222223
<support name="membind.firsttouch_membind"/>
223224
<support name="membind.bind_membind"/>
224225
<support name="membind.interleave_membind"/>
225226
<support name="membind.migrate_membind"/>
226-
<support name="membind.get_area_memlocation"/>
227227
<support name="custom.exported_support"/>
228228
<cpukind cpuset="0x00000303,0x03030000,,0x03030303">
229229
<info name="FrequencyMaxMHz" value="4023"/>

utils/hwloc/test-hwloc-annotate.output2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@
216216
<support name="cpubind.get_thisthread_last_cpu_location"/>
217217
<support name="membind.set_thisthread_membind"/>
218218
<support name="membind.get_thisthread_membind"/>
219+
<support name="membind.alloc_membind"/>
219220
<support name="membind.set_area_membind"/>
220221
<support name="membind.get_area_membind"/>
221-
<support name="membind.alloc_membind"/>
222+
<support name="membind.get_area_memlocation"/>
222223
<support name="membind.firsttouch_membind"/>
223224
<support name="membind.bind_membind"/>
224225
<support name="membind.interleave_membind"/>
225226
<support name="membind.migrate_membind"/>
226-
<support name="membind.get_area_memlocation"/>
227227
<support name="custom.exported_support"/>
228228
<cpukind cpuset="0x00000303,0x03030000,,0x03030303">
229229
<info name="FrequencyMaxMHz" value="4023"/>

utils/hwloc/test-hwloc-info.output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ membind:set_proc_membind = 0
4141
membind:get_proc_membind = 0
4242
membind:set_thisthread_membind = 0
4343
membind:get_thisthread_membind = 0
44+
membind:alloc_membind = 0
4445
membind:set_area_membind = 0
4546
membind:get_area_membind = 0
46-
membind:alloc_membind = 0
47+
membind:get_area_memlocation = 0
4748
membind:firsttouch_membind = 0
4849
membind:bind_membind = 0
4950
membind:interleave_membind = 0
5051
membind:weighted_interleave_membind = 0
5152
membind:nexttouch_membind = 0
5253
membind:migrate_membind = 0
53-
membind:get_area_memlocation = 0
5454
misc:imported_support = 0
5555

5656
# Core range

0 commit comments

Comments
 (0)