404507
From 1bf25232a148ae013a327e1096fb221182a9ed7d Mon Sep 17 00:00:00 2001
404507
Message-Id: <1bf25232a148ae013a327e1096fb221182a9ed7d@dist-git>
404507
From: Martin Kletzander <mkletzan@redhat.com>
404507
Date: Wed, 31 Jan 2018 16:32:20 +0100
404507
Subject: [PATCH] tests: Minor adjustments for test data
404507
MIME-Version: 1.0
404507
Content-Type: text/plain; charset=UTF-8
404507
Content-Transfer-Encoding: 8bit
404507
404507
https://bugzilla.redhat.com/show_bug.cgi?id=1289368
404507
404507
This patch modifies some not yet used test data so that the adding a test using
404507
this data is a clean patch and not an addition of huge file with some
404507
adjustments in small files that will be hidden in the middle of that commit.
404507
These changes include:
404507
404507
- Add system dir in vircaps2xmldata/linux-caches
404507
404507
  Back when data for systems with resctrl support were added they had the
404507
  /sys/fs/system directory put into a system/ subdir of the test and
404507
  /sys/fs/resctrl in a resctrl/ subdir of that test.  However, if we also want a
404507
  negative test for the resctrl (requesting allocation on a system that does not
404507
  support resctrl), we need one a test case with any sensible (with cache info)
404507
  system/ subdir and no resctrl/ one.  Easiest way is to add a
404507
  system -> . symlink into existing test case.
404507
404507
- Change default group schemata for linux-resctrl and linux-resctrl-cdp
404507
404507
  That way we can fit some allocation in.
404507
404507
- Remove one cache from resctrl-skx's schemata and make some room for
404507
  allocations
404507
404507
  That system already has only one cache, so that file was wrong anyway.  We
404507
  have a version with 2 caches already (linux-resctrl-skx-twocaches), so this
404507
  will also add variety to future tests.
404507
404507
- Add some empty allocation for resctrl-skx
404507
404507
  Just to have slightly more coverage and variety.  We can be sure nothing bad
404507
  happens if such allocation exists in case we have that in the tests.
404507
404507
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
404507
(cherry picked from commit 993c7f003012d1f249f1cdecc6ac56abaffe1e9b)
404507
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
404507
---
404507
 tests/vircaps2xmldata/linux-caches/system                      | 1 +
404507
 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata       | 4 ++--
404507
 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata | 0
404507
 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata       | 2 +-
404507
 tests/vircaps2xmldata/linux-resctrl/resctrl/schemata           | 2 +-
404507
 5 files changed, 5 insertions(+), 4 deletions(-)
404507
 create mode 120000 tests/vircaps2xmldata/linux-caches/system
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata
404507
404507
diff --git a/tests/vircaps2xmldata/linux-caches/system b/tests/vircaps2xmldata/linux-caches/system
404507
new file mode 120000
404507
index 0000000000..945c9b46d6
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-caches/system
404507
@@ -0,0 +1 @@
404507
+.
404507
\ No newline at end of file
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata
404507
index 89dc76b864..5de8fb0261 100644
404507
--- a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata
404507
@@ -1,2 +1,2 @@
404507
-L3DATA:0=fffff;1=fffff
404507
-L3CODE:0=fffff;1=fffff
404507
+L3DATA:0=fffff;1=fc000
404507
+L3CODE:0=ff003;1=f00ff
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata
404507
new file mode 100644
404507
index 0000000000..e69de29bb2
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata
404507
index 4a49137353..191081f1db 100644
404507
--- a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata
404507
@@ -1 +1 @@
404507
-L3:0=7ff;1=7ff
404507
+L3:0=0f0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
404507
index 9b47d25fc7..c1a765f1e0 100644
404507
--- a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
404507
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
404507
@@ -1 +1 @@
404507
-L3:0=1ffff;1=1ffff
404507
+L3:0=1ff00;1=1ff0f
404507
-- 
404507
2.16.1
404507