dcavalca / rpms / util-linux

Forked from rpms/util-linux 2 years ago
Clone

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

64664a
From e5d31b4ffb3f978a8935d35301a59eeafe6a50d4 Mon Sep 17 00:00:00 2001
64664a
From: Karel Zak <kzak@redhat.com>
64664a
Date: Tue, 4 Apr 2017 11:58:09 +0200
64664a
Subject: [PATCH 120/121] tests: update for RHEL7.4 changes
64664a
64664a
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1360764
64664a
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1344726
64664a
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1402183
64664a
Signed-off-by: Karel Zak <kzak@redhat.com>
64664a
---
64664a
 lib/Makemodule.am                            | 1 +
64664a
 tests/expected/fdisk/gpt                     | 5 +++++
64664a
 tests/expected/lscpu/lscpu-armv7             | 5 +++++
64664a
 tests/expected/lscpu/lscpu-s390-kvm          | 2 ++
64664a
 tests/expected/lscpu/lscpu-s390-lpar         | 2 ++
64664a
 tests/expected/lscpu/lscpu-s390-zvm          | 2 ++
64664a
 tests/expected/lscpu/lscpu-x86_64-64cpu      | 5 ++++-
64664a
 tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 5 ++++-
64664a
 tests/ts/fdisk/gpt                           | 3 ++-
64664a
 9 files changed, 27 insertions(+), 3 deletions(-)
64664a
64664a
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
64664a
index faf9d74..acae27a 100644
64664a
--- a/lib/Makemodule.am
64664a
+++ b/lib/Makemodule.am
64664a
@@ -82,6 +82,7 @@ test_ismounted_LDADD = libcommon.la
64664a
 
64664a
 test_wholedisk_SOURCES = lib/wholedisk.c
64664a
 test_wholedisk_CFLAGS = -DTEST_PROGRAM
64664a
+test_wholedisk_LDADD = libcommon.la
64664a
 
64664a
 test_mangle_SOURCES = lib/mangle.c
64664a
 test_mangle_CFLAGS = -DTEST_PROGRAM
64664a
diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt
64664a
index b73d5c3..017d819 100644
64664a
--- a/tests/expected/fdisk/gpt
64664a
+++ b/tests/expected/fdisk/gpt
64664a
@@ -7,6 +7,7 @@ Units = sectors of 1 * 512 = 512 bytes
64664a
 Sector size (logical/physical): 512 bytes / 512 bytes
64664a
 I/O size (minimum/optimal): 512 bytes / 512 bytes
64664a
 Disk label type: gpt
64664a
+Disk identifier: <removed>
64664a
 
64664a
 
64664a
 #         Start          End    Size  Type            Name
64664a
@@ -21,6 +22,7 @@ Units = sectors of 1 * 512 = 512 bytes
64664a
 Sector size (logical/physical): 512 bytes / 512 bytes
64664a
 I/O size (minimum/optimal): 512 bytes / 512 bytes
64664a
 Disk label type: gpt
64664a
+Disk identifier: <removed>
64664a
 
64664a
 
64664a
 #         Start          End    Size  Type            Name
64664a
@@ -42,6 +44,7 @@ Units = sectors of 1 * 512 = 512 bytes
64664a
 Sector size (logical/physical): 512 bytes / 512 bytes
64664a
 I/O size (minimum/optimal): 512 bytes / 512 bytes
64664a
 Disk label type: gpt
64664a
+Disk identifier: <removed>
64664a
 
64664a
 
64664a
 #         Start          End    Size  Type            Name
64664a
@@ -63,6 +66,7 @@ Units = sectors of 1 * 512 = 512 bytes
64664a
 Sector size (logical/physical): 512 bytes / 512 bytes
64664a
 I/O size (minimum/optimal): 512 bytes / 512 bytes
64664a
 Disk label type: gpt
64664a
+Disk identifier: <removed>
64664a
 
64664a
 
64664a
 #         Start          End    Size  Type            Name
64664a
@@ -83,6 +87,7 @@ Units = sectors of 1 * 512 = 512 bytes
64664a
 Sector size (logical/physical): 512 bytes / 512 bytes
64664a
 I/O size (minimum/optimal): 512 bytes / 512 bytes
64664a
 Disk label type: gpt
64664a
+Disk identifier: <removed>
64664a
 
64664a
 
64664a
 #         Start          End    Size  Type            Name
64664a
diff --git a/tests/expected/lscpu/lscpu-armv7 b/tests/expected/lscpu/lscpu-armv7
64664a
index a1b691c..bcb16cc 100644
64664a
--- a/tests/expected/lscpu/lscpu-armv7
64664a
+++ b/tests/expected/lscpu/lscpu-armv7
64664a
@@ -3,6 +3,11 @@ On-line CPU(s) list:   0,1
64664a
 Thread(s) per core:    1
64664a
 Core(s) per socket:    2
64664a
 Socket(s):             1
64664a
+Model:                 4
64664a
+CPU max MHz:           1700.0000
64664a
+CPU min MHz:           200.0000
64664a
+BogoMIPS:              1694.10
64664a
+Flags:                 swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpv4 idiva idivt
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/expected/lscpu/lscpu-s390-kvm b/tests/expected/lscpu/lscpu-s390-kvm
64664a
index 1aa42f9..66d1c04 100644
64664a
--- a/tests/expected/lscpu/lscpu-s390-kvm
64664a
+++ b/tests/expected/lscpu/lscpu-s390-kvm
64664a
@@ -6,11 +6,13 @@ Core(s) per socket:    1
64664a
 Socket(s) per book:    1
64664a
 Book(s):               3
64664a
 Vendor ID:             IBM/S390
64664a
+Machine type:          2817
64664a
 BogoMIPS:              14367.00
64664a
 Hypervisor:            KVM/Linux
64664a
 Hypervisor vendor:     KVM
64664a
 Virtualization type:   full
64664a
 Dispatching mode:      horizontal
64664a
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/expected/lscpu/lscpu-s390-lpar b/tests/expected/lscpu/lscpu-s390-lpar
64664a
index 0799ab9..9c8ac2c 100644
64664a
--- a/tests/expected/lscpu/lscpu-s390-lpar
64664a
+++ b/tests/expected/lscpu/lscpu-s390-lpar
64664a
@@ -7,11 +7,13 @@ Core(s) per socket:    4
64664a
 Socket(s) per book:    6
64664a
 Book(s):               4
64664a
 Vendor ID:             IBM/S390
64664a
+Machine type:          2817
64664a
 BogoMIPS:              14367.00
64664a
 Hypervisor:            PR/SM
64664a
 Hypervisor vendor:     IBM
64664a
 Virtualization type:   full
64664a
 Dispatching mode:      vertical
64664a
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/expected/lscpu/lscpu-s390-zvm b/tests/expected/lscpu/lscpu-s390-zvm
64664a
index 04dcf76..4cd6b8f 100644
64664a
--- a/tests/expected/lscpu/lscpu-s390-zvm
64664a
+++ b/tests/expected/lscpu/lscpu-s390-zvm
64664a
@@ -6,11 +6,13 @@ Core(s) per socket:    1
64664a
 Socket(s) per book:    1
64664a
 Book(s):               4
64664a
 Vendor ID:             IBM/S390
64664a
+Machine type:          2817
64664a
 BogoMIPS:              14367.00
64664a
 Hypervisor:            z/VM 6.1.0
64664a
 Hypervisor vendor:     IBM
64664a
 Virtualization type:   full
64664a
 Dispatching mode:      horizontal
64664a
+Flags:                 esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu
64664a
index 32aa57c..07990ea 100644
64664a
--- a/tests/expected/lscpu/lscpu-x86_64-64cpu
64664a
+++ b/tests/expected/lscpu/lscpu-x86_64-64cpu
64664a
@@ -11,7 +11,9 @@ Model:                 46
64664a
 Model name:            Intel(R) Xeon(R) CPU           X7550  @ 2.00GHz
64664a
 Stepping:              6
64664a
 CPU MHz:               1064.000
64664a
-BogoMIPS:              3989.44
64664a
+CPU max MHz:           1996.0000
64664a
+CPU min MHz:           1064.0000
64664a
+BogoMIPS:              3990.31
64664a
 Virtualization:        VT-x
64664a
 L1d cache:             32K
64664a
 L1i cache:             32K
64664a
@@ -20,6 +22,7 @@ L3 cache:              18432K
64664a
 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
64664a
 NUMA node2 CPU(s):     1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61
64664a
 NUMA node3 CPU(s):     3,7,11,15,19,23,27,31,35,39,43,47,51,55,59,63
64664a
+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
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
64664a
index a81878d..39ec32c 100644
64664a
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
64664a
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
64664a
@@ -11,13 +11,16 @@ Model:                 37
64664a
 Model name:            Intel(R) Core(TM) i5 CPU       M 560  @ 2.67GHz
64664a
 Stepping:              5
64664a
 CPU MHz:               1199.000
64664a
-BogoMIPS:              5319.97
64664a
+CPU max MHz:           2667.0000
64664a
+CPU min MHz:           1199.0000
64664a
+BogoMIPS:              5319.92
64664a
 Virtualization:        VT-x
64664a
 L1d cache:             32K
64664a
 L1i cache:             32K
64664a
 L2 cache:              256K
64664a
 L3 cache:              3072K
64664a
 NUMA node0 CPU(s):     0-3
64664a
+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
64664a
 
64664a
 # The following is the parsable format, which can be fed to other
64664a
 # programs. Each different item in every column has an unique ID
64664a
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
64664a
index a0902ca..ec3438f 100755
64664a
--- a/tests/ts/fdisk/gpt
64664a
+++ b/tests/ts/fdisk/gpt
64664a
@@ -38,7 +38,8 @@ function print_layout {
64664a
 	echo -ne "\n---layout----------" >> $TS_OUTPUT
64664a
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} 2> /dev/null | \
64664a
 		sed 's/^.*\.img/__ts_dev__/g;
64664a
-		     s/^[[:blank:]]*Device Boot/     Device Boot/g' >> $TS_OUTPUT 2>&1
64664a
+		     s/^[[:blank:]]*Device Boot/     Device Boot/g;
64664a
+		     s/^Disk identifier:.*/Disk identifier: <removed>/g' >> $TS_OUTPUT 2>&1
64664a
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
64664a
 }
64664a
 
64664a
-- 
64664a
2.9.3
64664a