Blame SOURCES/0120-tests-update-for-RHEL7.4-changes.patch

531551
From e5d31b4ffb3f978a8935d35301a59eeafe6a50d4 Mon Sep 17 00:00:00 2001
531551
From: Karel Zak <kzak@redhat.com>
531551
Date: Tue, 4 Apr 2017 11:58:09 +0200
531551
Subject: [PATCH 120/121] tests: update for RHEL7.4 changes
531551
531551
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1360764
531551
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1344726
531551
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1402183
531551
Signed-off-by: Karel Zak <kzak@redhat.com>
531551
---
531551
 lib/Makemodule.am                            | 1 +
531551
 tests/expected/fdisk/gpt                     | 5 +++++
531551
 tests/expected/lscpu/lscpu-armv7             | 5 +++++
531551
 tests/expected/lscpu/lscpu-s390-kvm          | 2 ++
531551
 tests/expected/lscpu/lscpu-s390-lpar         | 2 ++
531551
 tests/expected/lscpu/lscpu-s390-zvm          | 2 ++
531551
 tests/expected/lscpu/lscpu-x86_64-64cpu      | 5 ++++-
531551
 tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 5 ++++-
531551
 tests/ts/fdisk/gpt                           | 3 ++-
531551
 9 files changed, 27 insertions(+), 3 deletions(-)
531551
531551
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
531551
index faf9d74..acae27a 100644
531551
--- a/lib/Makemodule.am
531551
+++ b/lib/Makemodule.am
531551
@@ -82,6 +82,7 @@ test_ismounted_LDADD = libcommon.la
531551
 
531551
 test_wholedisk_SOURCES = lib/wholedisk.c
531551
 test_wholedisk_CFLAGS = -DTEST_PROGRAM
531551
+test_wholedisk_LDADD = libcommon.la
531551
 
531551
 test_mangle_SOURCES = lib/mangle.c
531551
 test_mangle_CFLAGS = -DTEST_PROGRAM
531551
diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt
531551
index b73d5c3..017d819 100644
531551
--- a/tests/expected/fdisk/gpt
531551
+++ b/tests/expected/fdisk/gpt
531551
@@ -7,6 +7,7 @@ Units = sectors of 1 * 512 = 512 bytes
531551
 Sector size (logical/physical): 512 bytes / 512 bytes
531551
 I/O size (minimum/optimal): 512 bytes / 512 bytes
531551
 Disk label type: gpt
531551
+Disk identifier: <removed>
531551
 
531551
 
531551
 #         Start          End    Size  Type            Name
531551
@@ -21,6 +22,7 @@ Units = sectors of 1 * 512 = 512 bytes
531551
 Sector size (logical/physical): 512 bytes / 512 bytes
531551
 I/O size (minimum/optimal): 512 bytes / 512 bytes
531551
 Disk label type: gpt
531551
+Disk identifier: <removed>
531551
 
531551
 
531551
 #         Start          End    Size  Type            Name
531551
@@ -42,6 +44,7 @@ Units = sectors of 1 * 512 = 512 bytes
531551
 Sector size (logical/physical): 512 bytes / 512 bytes
531551
 I/O size (minimum/optimal): 512 bytes / 512 bytes
531551
 Disk label type: gpt
531551
+Disk identifier: <removed>
531551
 
531551
 
531551
 #         Start          End    Size  Type            Name
531551
@@ -63,6 +66,7 @@ Units = sectors of 1 * 512 = 512 bytes
531551
 Sector size (logical/physical): 512 bytes / 512 bytes
531551
 I/O size (minimum/optimal): 512 bytes / 512 bytes
531551
 Disk label type: gpt
531551
+Disk identifier: <removed>
531551
 
531551
 
531551
 #         Start          End    Size  Type            Name
531551
@@ -83,6 +87,7 @@ Units = sectors of 1 * 512 = 512 bytes
531551
 Sector size (logical/physical): 512 bytes / 512 bytes
531551
 I/O size (minimum/optimal): 512 bytes / 512 bytes
531551
 Disk label type: gpt
531551
+Disk identifier: <removed>
531551
 
531551
 
531551
 #         Start          End    Size  Type            Name
531551
diff --git a/tests/expected/lscpu/lscpu-armv7 b/tests/expected/lscpu/lscpu-armv7
531551
index a1b691c..bcb16cc 100644
531551
--- a/tests/expected/lscpu/lscpu-armv7
531551
+++ b/tests/expected/lscpu/lscpu-armv7
531551
@@ -3,6 +3,11 @@ On-line CPU(s) list:   0,1
531551
 Thread(s) per core:    1
531551
 Core(s) per socket:    2
531551
 Socket(s):             1
531551
+Model:                 4
531551
+CPU max MHz:           1700.0000
531551
+CPU min MHz:           200.0000
531551
+BogoMIPS:              1694.10
531551
+Flags:                 swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpv4 idiva idivt
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/expected/lscpu/lscpu-s390-kvm b/tests/expected/lscpu/lscpu-s390-kvm
531551
index 1aa42f9..66d1c04 100644
531551
--- a/tests/expected/lscpu/lscpu-s390-kvm
531551
+++ b/tests/expected/lscpu/lscpu-s390-kvm
531551
@@ -6,11 +6,13 @@ Core(s) per socket:    1
531551
 Socket(s) per book:    1
531551
 Book(s):               3
531551
 Vendor ID:             IBM/S390
531551
+Machine type:          2817
531551
 BogoMIPS:              14367.00
531551
 Hypervisor:            KVM/Linux
531551
 Hypervisor vendor:     KVM
531551
 Virtualization type:   full
531551
 Dispatching mode:      horizontal
531551
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/expected/lscpu/lscpu-s390-lpar b/tests/expected/lscpu/lscpu-s390-lpar
531551
index 0799ab9..9c8ac2c 100644
531551
--- a/tests/expected/lscpu/lscpu-s390-lpar
531551
+++ b/tests/expected/lscpu/lscpu-s390-lpar
531551
@@ -7,11 +7,13 @@ Core(s) per socket:    4
531551
 Socket(s) per book:    6
531551
 Book(s):               4
531551
 Vendor ID:             IBM/S390
531551
+Machine type:          2817
531551
 BogoMIPS:              14367.00
531551
 Hypervisor:            PR/SM
531551
 Hypervisor vendor:     IBM
531551
 Virtualization type:   full
531551
 Dispatching mode:      vertical
531551
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/expected/lscpu/lscpu-s390-zvm b/tests/expected/lscpu/lscpu-s390-zvm
531551
index 04dcf76..4cd6b8f 100644
531551
--- a/tests/expected/lscpu/lscpu-s390-zvm
531551
+++ b/tests/expected/lscpu/lscpu-s390-zvm
531551
@@ -6,11 +6,13 @@ Core(s) per socket:    1
531551
 Socket(s) per book:    1
531551
 Book(s):               4
531551
 Vendor ID:             IBM/S390
531551
+Machine type:          2817
531551
 BogoMIPS:              14367.00
531551
 Hypervisor:            z/VM 6.1.0
531551
 Hypervisor vendor:     IBM
531551
 Virtualization type:   full
531551
 Dispatching mode:      horizontal
531551
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu
531551
index 32aa57c..07990ea 100644
531551
--- a/tests/expected/lscpu/lscpu-x86_64-64cpu
531551
+++ b/tests/expected/lscpu/lscpu-x86_64-64cpu
531551
@@ -11,7 +11,9 @@ Model:                 46
531551
 Model name:            Intel(R) Xeon(R) CPU           X7550  @ 2.00GHz
531551
 Stepping:              6
531551
 CPU MHz:               1064.000
531551
-BogoMIPS:              3989.44
531551
+CPU max MHz:           1996.0000
531551
+CPU min MHz:           1064.0000
531551
+BogoMIPS:              3990.31
531551
 Virtualization:        VT-x
531551
 L1d cache:             32K
531551
 L1i cache:             32K
531551
@@ -20,6 +22,7 @@ L3 cache:              18432K
531551
 NUMA node0 CPU(s):     0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62
531551
 NUMA node2 CPU(s):     1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61
531551
 NUMA node3 CPU(s):     3,7,11,15,19,23,27,31,35,39,43,47,51,55,59,63
531551
+Flags:                 fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 x2apic popcnt lahf_lm ida epb dts tpr_shadow vnmi flexpriority ept vpid
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
531551
index a81878d..39ec32c 100644
531551
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
531551
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
531551
@@ -11,13 +11,16 @@ Model:                 37
531551
 Model name:            Intel(R) Core(TM) i5 CPU       M 560  @ 2.67GHz
531551
 Stepping:              5
531551
 CPU MHz:               1199.000
531551
-BogoMIPS:              5319.97
531551
+CPU max MHz:           2667.0000
531551
+CPU min MHz:           1199.0000
531551
+BogoMIPS:              5319.92
531551
 Virtualization:        VT-x
531551
 L1d cache:             32K
531551
 L1i cache:             32K
531551
 L2 cache:              256K
531551
 L3 cache:              3072K
531551
 NUMA node0 CPU(s):     0-3
531551
+Flags:                 fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt aes lahf_lm ida arat dts tpr_shadow vnmi flexpriority ept vpid
531551
 
531551
 # The following is the parsable format, which can be fed to other
531551
 # programs. Each different item in every column has an unique ID
531551
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
531551
index a0902ca..ec3438f 100755
531551
--- a/tests/ts/fdisk/gpt
531551
+++ b/tests/ts/fdisk/gpt
531551
@@ -38,7 +38,8 @@ function print_layout {
531551
 	echo -ne "\n---layout----------" >> $TS_OUTPUT
531551
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} 2> /dev/null | \
531551
 		sed 's/^.*\.img/__ts_dev__/g;
531551
-		     s/^[[:blank:]]*Device Boot/     Device Boot/g' >> $TS_OUTPUT 2>&1
531551
+		     s/^[[:blank:]]*Device Boot/     Device Boot/g;
531551
+		     s/^Disk identifier:.*/Disk identifier: <removed>/g' >> $TS_OUTPUT 2>&1
531551
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
531551
 }
531551
 
531551
-- 
531551
2.9.3
531551