tests: update build-sys test

The libtinfo is enough (and libncurses optional for cal).

Signed-off-by: Karel Zak <kzak@redhat.com>

19 files changed, 18 insertions, 20 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 3d5f4873b..d0e8e6ece 100644
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 3d5f4873b..d0e8e6ece 100644
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 8ea2ac79f..38de1f3f8 100644
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 198dd9f48..e147a6bf3 100644
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libselinux libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 1916b37d3..880bb6054 100644
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libreadline libselinux 
 chmem:  
diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index 153feff8a..7c55754e7 100644
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libreadline libselinux 
 chmem:  
diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index badfb27e3..924bee1df 100644
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index d2135853d..2032354b0 100644
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libselinux libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index d2135853d..2032354b0 100644
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libselinux libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index 2c74eee2d..3347f9bd9 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -22,7 +22,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 423ff5e20..8ed432387 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -29,7 +29,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index 490c416d2..bdd215def 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -2,7 +2,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index da895a819..fcbc6c5ca 100644
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -20,7 +20,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 699f23d24..c2d814db2 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -35,7 +35,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index badfb27e3..924bee1df 100644
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-non-widechar b/tests/expected/build-sys/config-non-widechar
index 92535f2b0..e69de29bb 100644
--- a/tests/expected/build-sys/config-non-widechar
+++ b/tests/expected/build-sys/config-non-widechar
@@ -1,2 +0,0 @@
-colcrt:  
-nologin:  
diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index 99e0d64b1..271c58027 100644
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libselinux libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 832c86c4a..94607bdf8 100644
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -42,7 +42,7 @@ agetty:
 blkdiscard:  librt 
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem:  
diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index ec3444f17..c32d2a025 100644
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -43,7 +43,7 @@ blkdiscard:  librt
 blkid.static: STATIC
 blkzone:  
 blockdev:  
-cal:  libncursesw libtinfo 
+cal:  libtinfo 
 chcpu:  
 chfn:  libpam libpam_misc libpthread libreadline libuser 
 chmem: