|
 |
c1c534 |
From f0b982a8f6e736bcf5070c6d3ed166159792dda1 Mon Sep 17 00:00:00 2001
|
|
|
c1c534 |
Message-Id: <f0b982a8f6e736bcf5070c6d3ed166159792dda1@dist-git>
|
|
|
c1c534 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
Date: Wed, 31 Jan 2018 16:32:33 +0100
|
|
|
c1c534 |
Subject: [PATCH] tests: Clean up and modify some vircaps2xmldata
|
|
|
c1c534 |
|
|
|
c1c534 |
Basically the `cpus` and `tasks` files are not needed, and I've witnessed on a
|
|
|
c1c534 |
real system that the schemata file may have spaces prepended to a line, so let's
|
|
|
c1c534 |
adjust at least one test so that it reflects what can happen. Also `000`
|
|
|
c1c534 |
allocation is invalid and a full mask means it's all free. So adjust for that
|
|
|
c1c534 |
too.
|
|
|
c1c534 |
|
|
|
c1c534 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
(cherry picked from commit 47bb586c7533fc9f8366d078b3db26e791aaadf2)
|
|
|
c1c534 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
|
|
|
c1c534 |
https://bugzilla.redhat.com/show_bug.cgi?id=1289368
|
|
|
c1c534 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
---
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 -
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks | 0
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata | 2 +-
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 -
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl/resctrl/schemata | 2 +-
|
|
|
c1c534 |
tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0
|
|
|
c1c534 |
tests/virresctrldata/resctrl-skx-twocaches.schemata | 2 +-
|
|
|
c1c534 |
7 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
c1c534 |
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
|
|
|
c1c534 |
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks
|
|
|
c1c534 |
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
|
|
|
c1c534 |
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
|
|
|
c1c534 |
deleted file mode 100644
|
|
|
c1c534 |
index b3a79aa953..0000000000
|
|
|
c1c534 |
--- a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
|
|
|
c1c534 |
+++ /dev/null
|
|
|
c1c534 |
@@ -1 +0,0 @@
|
|
|
c1c534 |
-ffffff,ffffffff,ffffffff
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks
|
|
|
c1c534 |
deleted file mode 100644
|
|
|
c1c534 |
index e69de29bb2..0000000000
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
|
|
|
c1c534 |
index 691fbaf887..23af473be4 100644
|
|
|
c1c534 |
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
|
|
|
c1c534 |
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
|
|
|
c1c534 |
@@ -1 +1 @@
|
|
|
c1c534 |
-L3:0=0f0;1=000
|
|
|
c1c534 |
+L3:0=0f0;1=7ff
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
|
|
|
c1c534 |
deleted file mode 100644
|
|
|
c1c534 |
index 98d03acc98..0000000000
|
|
|
c1c534 |
--- a/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
|
|
|
c1c534 |
+++ /dev/null
|
|
|
c1c534 |
@@ -1 +0,0 @@
|
|
|
c1c534 |
-fff
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
|
|
|
c1c534 |
index c1a765f1e0..78d2d8a9b8 100644
|
|
|
c1c534 |
--- a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
|
|
|
c1c534 |
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
|
|
|
c1c534 |
@@ -1 +1 @@
|
|
|
c1c534 |
-L3:0=1ff00;1=1ff0f
|
|
|
c1c534 |
+ L3:0=1ff00;1=1ff0f
|
|
|
c1c534 |
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
|
|
|
c1c534 |
deleted file mode 100644
|
|
|
c1c534 |
index e69de29bb2..0000000000
|
|
|
c1c534 |
diff --git a/tests/virresctrldata/resctrl-skx-twocaches.schemata b/tests/virresctrldata/resctrl-skx-twocaches.schemata
|
|
|
c1c534 |
index 86b3801a04..890d003bf2 100644
|
|
|
c1c534 |
--- a/tests/virresctrldata/resctrl-skx-twocaches.schemata
|
|
|
c1c534 |
+++ b/tests/virresctrldata/resctrl-skx-twocaches.schemata
|
|
|
c1c534 |
@@ -1 +1 @@
|
|
|
c1c534 |
-L3:0=001;1=400
|
|
|
c1c534 |
+L3:0=001;1=000
|
|
|
c1c534 |
--
|
|
|
c1c534 |
2.16.1
|
|
|
c1c534 |
|