render / rpms / libvirt

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