tests/linux: add a test case with PCI + 2 MICs ...

tests/linux: add a test case with PCI + 2 MICs using the old driver

It experience the directlookup hacky code (when the driver doesn't
create sysfs symlinks as expected).

This commit was SVN r5718.

diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.options b/tests/linux/24em64t-2n6c2t+2mic.olddriver.options
new file mode 100644 (file)
index 0000000..6ad2e0d
--- /dev/null
+++ b/tests/linux/24em64t-2n6c2t+2mic.olddriver.options
@@ -0,0 +1 @@
+-v --of xml --whole-io

diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.output b/tests/linux/24em64t-2n6c2t+2mic.olddriver.output
new file mode 100644 (file)
index 0000000..308c143
--- /dev/null
+++ b/tests/linux/24em64t-2n6c2t+2mic.olddriver.output
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topology SYSTEM "hwloc.dtd">
+<topology>
+  <object type="Machine" os_index="0" cpuset="0x00ffffff" complete_cpuset="0x00ffffff" online_cpuset="0x00ffffff" allowed_cpuset="0x00ffffff" nodeset="0x00000003" complete_nodeset="0x00000003" allowed_nodeset="0x00000003">
+    <info name="DMIProductName" value="S5520SC"/>
+    <info name="DMIProductVersion" value="...................."/>
+    <info name="DMIBoardVendor" value="Intel Corporation"/>
+    <info name="DMIBoardName" value="S5520SC"/>
+    <info name="DMIBoardVersion" value="E30682-355"/>
+    <info name="DMIBoardAssetTag" value="...................."/>
+    <info name="DMIChassisVendor" value=".............................."/>
+    <info name="DMIChassisType" value="17"/>
+    <info name="DMIChassisVersion" value=".................."/>
+    <info name="DMIChassisAssetTag" value="...................."/>
+    <info name="DMIBIOSVendor" value="Intel Corp."/>
+    <info name="DMIBIOSVersion" value="S5500.86B.01.X2.0059.091520111722"/>
+    <info name="DMIBIOSDate" value="09/15/2011"/>
+    <info name="DMISysVendor" value="Intel Corporation"/>
+    <info name="Backend" value="Linux"/>
+    <distances nbobjs="2" relative_depth="1" latency_base="10.000000">
+      <latency value="1.000000"/>
+      <latency value="2.100000"/>
+      <latency value="2.100000"/>
+      <latency value="1.000000"/>
+    </distances>
+    <object type="NUMANode" os_index="0" cpuset="0x00555555" complete_cpuset="0x00555555" online_cpuset="0x00555555" allowed_cpuset="0x00555555" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" local_memory="12817362944">
+      <object type="Socket" os_index="0" cpuset="0x00555555" complete_cpuset="0x00555555" online_cpuset="0x00555555" allowed_cpuset="0x00555555" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+        <info name="CPUModel" value="Intel(R) Xeon(R) CPU           X5680  @ 3.33GHz"/>
+        <object type="Cache" cpuset="0x00555555" complete_cpuset="0x00555555" online_cpuset="0x00555555" allowed_cpuset="0x00555555" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="12582912" depth="3" cache_linesize="64" cache_associativity="16" cache_type="0">
+          <object type="Cache" cpuset="0x00001001" complete_cpuset="0x00001001" online_cpuset="0x00001001" allowed_cpuset="0x00001001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00001001" complete_cpuset="0x00001001" online_cpuset="0x00001001" allowed_cpuset="0x00001001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00001001" complete_cpuset="0x00001001" online_cpuset="0x00001001" allowed_cpuset="0x00001001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="0" cpuset="0x00001001" complete_cpuset="0x00001001" online_cpuset="0x00001001" allowed_cpuset="0x00001001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" online_cpuset="0x00000001" allowed_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="12" cpuset="0x00001000" complete_cpuset="0x00001000" online_cpuset="0x00001000" allowed_cpuset="0x00001000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00004004" complete_cpuset="0x00004004" online_cpuset="0x00004004" allowed_cpuset="0x00004004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00004004" complete_cpuset="0x00004004" online_cpuset="0x00004004" allowed_cpuset="0x00004004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00004004" complete_cpuset="0x00004004" online_cpuset="0x00004004" allowed_cpuset="0x00004004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="1" cpuset="0x00004004" complete_cpuset="0x00004004" online_cpuset="0x00004004" allowed_cpuset="0x00004004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" online_cpuset="0x00000004" allowed_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="14" cpuset="0x00004000" complete_cpuset="0x00004000" online_cpuset="0x00004000" allowed_cpuset="0x00004000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00010010" complete_cpuset="0x00010010" online_cpuset="0x00010010" allowed_cpuset="0x00010010" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00010010" complete_cpuset="0x00010010" online_cpuset="0x00010010" allowed_cpuset="0x00010010" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00010010" complete_cpuset="0x00010010" online_cpuset="0x00010010" allowed_cpuset="0x00010010" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="2" cpuset="0x00010010" complete_cpuset="0x00010010" online_cpuset="0x00010010" allowed_cpuset="0x00010010" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="4" cpuset="0x00000010" complete_cpuset="0x00000010" online_cpuset="0x00000010" allowed_cpuset="0x00000010" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="16" cpuset="0x00010000" complete_cpuset="0x00010000" online_cpuset="0x00010000" allowed_cpuset="0x00010000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00040040" complete_cpuset="0x00040040" online_cpuset="0x00040040" allowed_cpuset="0x00040040" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00040040" complete_cpuset="0x00040040" online_cpuset="0x00040040" allowed_cpuset="0x00040040" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00040040" complete_cpuset="0x00040040" online_cpuset="0x00040040" allowed_cpuset="0x00040040" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="8" cpuset="0x00040040" complete_cpuset="0x00040040" online_cpuset="0x00040040" allowed_cpuset="0x00040040" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="6" cpuset="0x00000040" complete_cpuset="0x00000040" online_cpuset="0x00000040" allowed_cpuset="0x00000040" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="18" cpuset="0x00040000" complete_cpuset="0x00040000" online_cpuset="0x00040000" allowed_cpuset="0x00040000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00100100" complete_cpuset="0x00100100" online_cpuset="0x00100100" allowed_cpuset="0x00100100" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00100100" complete_cpuset="0x00100100" online_cpuset="0x00100100" allowed_cpuset="0x00100100" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00100100" complete_cpuset="0x00100100" online_cpuset="0x00100100" allowed_cpuset="0x00100100" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="9" cpuset="0x00100100" complete_cpuset="0x00100100" online_cpuset="0x00100100" allowed_cpuset="0x00100100" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="8" cpuset="0x00000100" complete_cpuset="0x00000100" online_cpuset="0x00000100" allowed_cpuset="0x00000100" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="20" cpuset="0x00100000" complete_cpuset="0x00100000" online_cpuset="0x00100000" allowed_cpuset="0x00100000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00400400" complete_cpuset="0x00400400" online_cpuset="0x00400400" allowed_cpuset="0x00400400" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00400400" complete_cpuset="0x00400400" online_cpuset="0x00400400" allowed_cpuset="0x00400400" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00400400" complete_cpuset="0x00400400" online_cpuset="0x00400400" allowed_cpuset="0x00400400" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="10" cpuset="0x00400400" complete_cpuset="0x00400400" online_cpuset="0x00400400" allowed_cpuset="0x00400400" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+                  <object type="PU" os_index="10" cpuset="0x00000400" complete_cpuset="0x00000400" online_cpuset="0x00000400" allowed_cpuset="0x00000400" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                  <object type="PU" os_index="22" cpuset="0x00400000" complete_cpuset="0x00400000" online_cpuset="0x00400000" allowed_cpuset="0x00400000" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+                </object>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+    </object>
+    <object type="NUMANode" os_index="1" cpuset="0x00aaaaaa" complete_cpuset="0x00aaaaaa" online_cpuset="0x00aaaaaa" allowed_cpuset="0x00aaaaaa" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" local_memory="12884901888">
+      <object type="Socket" os_index="1" cpuset="0x00aaaaaa" complete_cpuset="0x00aaaaaa" online_cpuset="0x00aaaaaa" allowed_cpuset="0x00aaaaaa" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+        <info name="CPUModel" value="Intel(R) Xeon(R) CPU           X5680  @ 3.33GHz"/>
+        <object type="Cache" cpuset="0x00aaaaaa" complete_cpuset="0x00aaaaaa" online_cpuset="0x00aaaaaa" allowed_cpuset="0x00aaaaaa" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="12582912" depth="3" cache_linesize="64" cache_associativity="16" cache_type="0">
+          <object type="Cache" cpuset="0x00002002" complete_cpuset="0x00002002" online_cpuset="0x00002002" allowed_cpuset="0x00002002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00002002" complete_cpuset="0x00002002" online_cpuset="0x00002002" allowed_cpuset="0x00002002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00002002" complete_cpuset="0x00002002" online_cpuset="0x00002002" allowed_cpuset="0x00002002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="0" cpuset="0x00002002" complete_cpuset="0x00002002" online_cpuset="0x00002002" allowed_cpuset="0x00002002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" online_cpuset="0x00000002" allowed_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="13" cpuset="0x00002000" complete_cpuset="0x00002000" online_cpuset="0x00002000" allowed_cpuset="0x00002000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00008008" complete_cpuset="0x00008008" online_cpuset="0x00008008" allowed_cpuset="0x00008008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00008008" complete_cpuset="0x00008008" online_cpuset="0x00008008" allowed_cpuset="0x00008008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00008008" complete_cpuset="0x00008008" online_cpuset="0x00008008" allowed_cpuset="0x00008008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="1" cpuset="0x00008008" complete_cpuset="0x00008008" online_cpuset="0x00008008" allowed_cpuset="0x00008008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" online_cpuset="0x00000008" allowed_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="15" cpuset="0x00008000" complete_cpuset="0x00008000" online_cpuset="0x00008000" allowed_cpuset="0x00008000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00020020" complete_cpuset="0x00020020" online_cpuset="0x00020020" allowed_cpuset="0x00020020" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00020020" complete_cpuset="0x00020020" online_cpuset="0x00020020" allowed_cpuset="0x00020020" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00020020" complete_cpuset="0x00020020" online_cpuset="0x00020020" allowed_cpuset="0x00020020" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="2" cpuset="0x00020020" complete_cpuset="0x00020020" online_cpuset="0x00020020" allowed_cpuset="0x00020020" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="5" cpuset="0x00000020" complete_cpuset="0x00000020" online_cpuset="0x00000020" allowed_cpuset="0x00000020" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="17" cpuset="0x00020000" complete_cpuset="0x00020000" online_cpuset="0x00020000" allowed_cpuset="0x00020000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00080080" complete_cpuset="0x00080080" online_cpuset="0x00080080" allowed_cpuset="0x00080080" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00080080" complete_cpuset="0x00080080" online_cpuset="0x00080080" allowed_cpuset="0x00080080" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00080080" complete_cpuset="0x00080080" online_cpuset="0x00080080" allowed_cpuset="0x00080080" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="8" cpuset="0x00080080" complete_cpuset="0x00080080" online_cpuset="0x00080080" allowed_cpuset="0x00080080" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="7" cpuset="0x00000080" complete_cpuset="0x00000080" online_cpuset="0x00000080" allowed_cpuset="0x00000080" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="19" cpuset="0x00080000" complete_cpuset="0x00080000" online_cpuset="0x00080000" allowed_cpuset="0x00080000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00200200" complete_cpuset="0x00200200" online_cpuset="0x00200200" allowed_cpuset="0x00200200" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00200200" complete_cpuset="0x00200200" online_cpuset="0x00200200" allowed_cpuset="0x00200200" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00200200" complete_cpuset="0x00200200" online_cpuset="0x00200200" allowed_cpuset="0x00200200" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="9" cpuset="0x00200200" complete_cpuset="0x00200200" online_cpuset="0x00200200" allowed_cpuset="0x00200200" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="9" cpuset="0x00000200" complete_cpuset="0x00000200" online_cpuset="0x00000200" allowed_cpuset="0x00000200" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="21" cpuset="0x00200000" complete_cpuset="0x00200000" online_cpuset="0x00200000" allowed_cpuset="0x00200000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object type="Cache" cpuset="0x00800800" complete_cpuset="0x00800800" online_cpuset="0x00800800" allowed_cpuset="0x00800800" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
+            <object type="Cache" cpuset="0x00800800" complete_cpuset="0x00800800" online_cpuset="0x00800800" allowed_cpuset="0x00800800" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
+              <object type="Cache" cpuset="0x00800800" complete_cpuset="0x00800800" online_cpuset="0x00800800" allowed_cpuset="0x00800800" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="4" cache_type="2">
+                <object type="Core" os_index="10" cpuset="0x00800800" complete_cpuset="0x00800800" online_cpuset="0x00800800" allowed_cpuset="0x00800800" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
+                  <object type="PU" os_index="11" cpuset="0x00000800" complete_cpuset="0x00000800" online_cpuset="0x00000800" allowed_cpuset="0x00000800" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                  <object type="PU" os_index="23" cpuset="0x00800000" complete_cpuset="0x00800000" online_cpuset="0x00800000" allowed_cpuset="0x00800000" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
+                </object>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+    </object>
+    <object type="Bridge" os_index="0" bridge_type="0-1" depth="0" bridge_pci="0000:[00-07]">
+      <object type="PCIDev" os_index="0" pci_busid="0000:00:00.0" pci_type="0600 [8086:3406] [8086:34e2] 22" pci_link_speed="0.000000"/>
+      <object type="Bridge" os_index="16" bridge_type="1-1" depth="1" bridge_pci="0000:[01-01]" pci_busid="0000:00:01.0" pci_type="0604 [8086:3408] [0000:0000] 22" pci_link_speed="0.000000">
+        <object type="PCIDev" os_index="4096" pci_busid="0000:01:00.0" pci_type="0200 [8086:10a7] [8086:34e2] 02" pci_link_speed="0.000000">
+          <object type="OSDev" name="eth0" osdev_type="2">
+            <info name="Address" value="00:15:17:a3:83:d0"/>
+          </object>
+        </object>
+        <object type="PCIDev" os_index="4097" pci_busid="0000:01:00.1" pci_type="0200 [8086:10a7] [8086:34e2] 02" pci_link_speed="0.000000">
+          <object type="OSDev" name="eth1" osdev_type="2">
+            <info name="Address" value="00:15:17:a3:83:d1"/>
+          </object>
+        </object>
+      </object>
+      <object type="Bridge" os_index="48" bridge_type="1-1" depth="1" bridge_pci="0000:[02-02]" pci_busid="0000:00:03.0" pci_type="0604 [8086:340a] [0000:0000] 22" pci_link_speed="0.000000">
+        <object type="PCIDev" os_index="8192" pci_busid="0000:02:00.0" pci_type="0b40 [8086:225c] [8086:2500] 10" pci_link_speed="0.000000">
+          <object type="OSDev" name="mic0" osdev_type="5">
+            <info name="CoProcType" value="MIC"/>
+            <info name="MICFamily" value="Knights Corner"/>
+            <info name="MICSKU" value="ES2-P1750"/>
+            <info name="MICActiveCores" value="61"/>
+            <info name="MICMemorySize" value="8126464"/>
+          </object>
+        </object>
+      </object>
+      <object type="Bridge" os_index="112" bridge_type="1-1" depth="1" bridge_pci="0000:[03-03]" pci_busid="0000:00:07.0" pci_type="0604 [8086:340e] [0000:0000] 22" pci_link_speed="0.000000">
+        <object type="PCIDev" os_index="12288" pci_busid="0000:03:00.0" pci_type="0b40 [8086:225c] [8086:2500] 10" pci_link_speed="0.000000">
+          <object type="OSDev" name="mic1" osdev_type="5">
+            <info name="CoProcType" value="MIC"/>
+            <info name="MICFamily" value="Knights Corner"/>
+            <info name="MICSKU" value="ES2-P1750"/>
+            <info name="MICActiveCores" value="61"/>
+            <info name="MICMemorySize" value="8126464"/>
+          </object>
+        </object>
+      </object>
+      <object type="PCIDev" os_index="256" pci_busid="0000:00:10.0" pci_type="0800 [8086:3425] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="257" pci_busid="0000:00:10.1" pci_type="0800 [8086:3426] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="272" pci_busid="0000:00:11.0" pci_type="0800 [8086:3427] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="273" pci_busid="0000:00:11.1" pci_type="0800 [8086:3428] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="304" pci_busid="0000:00:13.0" pci_type="0800 [8086:342d] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="320" pci_busid="0000:00:14.0" pci_type="0800 [8086:342e] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="321" pci_busid="0000:00:14.1" pci_type="0800 [8086:3422] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="322" pci_busid="0000:00:14.2" pci_type="0800 [8086:3423] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="323" pci_busid="0000:00:14.3" pci_type="0800 [8086:3438] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="336" pci_busid="0000:00:15.0" pci_type="0800 [8086:342f] [0086:00e2] 22" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="352" pci_busid="0000:00:16.0" pci_type="0880 [8086:3430] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma0chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="353" pci_busid="0000:00:16.1" pci_type="0880 [8086:3431] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma1chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="354" pci_busid="0000:00:16.2" pci_type="0880 [8086:3432] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma2chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="355" pci_busid="0000:00:16.3" pci_type="0880 [8086:3433] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma3chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="356" pci_busid="0000:00:16.4" pci_type="0880 [8086:3429] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma4chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="357" pci_busid="0000:00:16.5" pci_type="0880 [8086:342a] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma5chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="358" pci_busid="0000:00:16.6" pci_type="0880 [8086:342b] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma6chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="359" pci_busid="0000:00:16.7" pci_type="0880 [8086:342c] [8086:34e2] 22" pci_link_speed="0.000000">
+        <object type="OSDev" name="dma7chan0" osdev_type="4"/>
+      </object>
+      <object type="PCIDev" os_index="416" pci_busid="0000:00:1a.0" pci_type="0c03 [8086:3a37] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="417" pci_busid="0000:00:1a.1" pci_type="0c03 [8086:3a38] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="418" pci_busid="0000:00:1a.2" pci_type="0c03 [8086:3a39] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="423" pci_busid="0000:00:1a.7" pci_type="0c03 [8086:3a3c] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="432" pci_busid="0000:00:1b.0" pci_type="0403 [8086:3a3e] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="Bridge" os_index="448" bridge_type="1-1" depth="1" bridge_pci="0000:[04-04]" pci_busid="0000:00:1c.0" pci_type="0604 [8086:3a40] [0000:0000] 00" pci_link_speed="0.000000"/>
+      <object type="Bridge" os_index="452" bridge_type="1-1" depth="1" bridge_pci="0000:[05-05]" pci_busid="0000:00:1c.4" pci_type="0604 [8086:3a48] [0000:0000] 00" pci_link_speed="0.000000">
+        <object type="PCIDev" os_index="20480" pci_busid="0000:05:00.0" pci_type="0300 [102b:0522] [8086:0101] 02" pci_link_speed="0.000000"/>
+      </object>
+      <object type="Bridge" os_index="453" bridge_type="1-1" depth="1" bridge_pci="0000:[06-06]" pci_busid="0000:00:1c.5" pci_type="0604 [8086:3a4a] [0000:0000] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="464" pci_busid="0000:00:1d.0" pci_type="0c03 [8086:3a34] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="465" pci_busid="0000:00:1d.1" pci_type="0c03 [8086:3a35] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="466" pci_busid="0000:00:1d.2" pci_type="0c03 [8086:3a36] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="471" pci_busid="0000:00:1d.7" pci_type="0c03 [8086:3a3a] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="Bridge" os_index="480" bridge_type="1-1" depth="1" bridge_pci="0000:[07-07]" pci_busid="0000:00:1e.0" pci_type="0604 [8086:244e] [0000:0000] 90" pci_link_speed="0.000000">
+        <object type="PCIDev" os_index="28688" pci_busid="0000:07:01.0" pci_type="0c00 [104c:8023] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      </object>
+      <object type="PCIDev" os_index="496" pci_busid="0000:00:1f.0" pci_type="0601 [8086:3a16] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="498" pci_busid="0000:00:1f.2" pci_type="0101 [8086:3a20] [8086:34e2] 00" pci_link_speed="0.000000">
+        <object type="OSDev" name="sda" osdev_type="0"/>
+      </object>
+      <object type="PCIDev" os_index="499" pci_busid="0000:00:1f.3" pci_type="0c05 [8086:3a30] [8086:34e2] 00" pci_link_speed="0.000000"/>
+      <object type="PCIDev" os_index="501" pci_busid="0000:00:1f.5" pci_type="0101 [8086:3a26] [8086:34e2] 00" pci_link_speed="0.000000">
+        <object type="OSDev" name="sr0" osdev_type="0"/>
+      </object>
+    </object>
+  </object>
+</topology>

diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 b/tests/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2
new file mode 100644 (file)
index 0000000..9f09abe
Binary files /dev/null and b/tests/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 differ

diff --git a/tests/linux/Makefile.am b/tests/linux/Makefile.am
index fbe6831770a1f22b2f818edf2723cd3f02d054dc..9e2345264d047fe4370e11152526d88ca5c53670 100644 (file)
--- a/tests/linux/Makefile.am
+++ b/tests/linux/Makefile.am
@@ -45,6 +45,7 @@ sysfs_outputs = \
                16em64t-4s2c2t.xml.output \
                16em64t-2m4c2t.output \
                16ia64-8n2s.output \
+               24em64t-2n6c2t+2mic.olddriver.output \
                40intel64-2g2n4c+pci.output \
                48amd64-4d2n6c-sparse.output \
                64amd64-4s2n4ca2co.output \
@@ -99,6 +100,7 @@ sysfs_tarballs = \
                16em64t-4s2c2t_ncaches.source \
                16em64t-4s2c2t.xml.source \
                16ia64-8n2s.tar.bz2 \
+               24em64t-2n6c2t+2mic.olddriver.tar.bz2 \
                40intel64-2g2n4c+pci.tar.bz2 \
                48amd64-4d2n6c-sparse.tar.bz2 \
                64amd64-4s2n4ca2co.tar.bz2 \
@@ -133,6 +135,7 @@ sysfs_options = \
                16em64t-4s2c2t_merge.options \
                16em64t-4s2c2t.xml.options \
                32amd64-4s2n4c-cgroup.xml.options \
+               24em64t-2n6c2t+2mic.olddriver.options \
                40intel64-2g2n4c+pci.options
 
 # Each output `xyz.output' may have a corresponding `xyz.env'