tests: update build-sys test

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

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

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 3d5f4873ba22290044604dc07074dac966c31fdd..d0e8e6ece474cd2ecf05c52df8757cc8f84b38a2 100644 (file)
--- 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 3d5f4873ba22290044604dc07074dac966c31fdd..d0e8e6ece474cd2ecf05c52df8757cc8f84b38a2 100644 (file)
--- 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 8ea2ac79ff246c28bb059303e52dd5f635f5e387..38de1f3f8df76278229db26b28f260b3b1c0cd5f 100644 (file)
--- 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 198dd9f4817a17729fe7e5aec2dfa195657e65c2..e147a6bf326b2c4710687c4da565e6b1b6700302 100644 (file)
--- 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 1916b37d396c5a6726c0a7c548ea6b2bf0b625ea..880bb605417627ba2c3dc81c8a17ef671a42eb26 100644 (file)
--- 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 153feff8af28625c22220aa64e88cbacb113d12c..7c55754e7f0fce38c68461d1aae81bed1278185a 100644 (file)
--- 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 badfb27e34c28fbeedd942b7582e6b1410fcba7c..924bee1df1a04804b49489393cf38bc41a25f1a8 100644 (file)
--- 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 d2135853d8285298bdeb00dbddcd9df35c3b4b3e..2032354b08c83791ed70d163d740626551145b6b 100644 (file)
--- 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 d2135853d8285298bdeb00dbddcd9df35c3b4b3e..2032354b08c83791ed70d163d740626551145b6b 100644 (file)
--- 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 2c74eee2dce5654e29c5e3703fc574660e444214..3347f9bd906842070579074ef069eab8179c48a5 100644 (file)
--- 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 423ff5e20c11c1feb44485aec9b830fe3ba850f4..8ed432387e42a193e603a2ee74c9b64b9d7fc307 100644 (file)
--- 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 490c416d2defdc929294f9e20a9f91d62c3a40bb..bdd215def40baa3c646834767ffc87b6301e771c 100644 (file)
--- 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 da895a8196ca498ec2e994d0df67eefaf2067b5e..fcbc6c5cabfcf3c3ffe68c54cfa2b08ada929ffa 100644 (file)
--- 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 699f23d24bd2e5964298e5cd8cbd0c6692a7a840..c2d814db2211bbd51f69408a6adc1455d0403634 100644 (file)
--- 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 badfb27e34c28fbeedd942b7582e6b1410fcba7c..924bee1df1a04804b49489393cf38bc41a25f1a8 100644 (file)
--- 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 92535f2b0a9f7d9c4dd76c3974d39cd7a4c0ea56..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 99e0d64b15d4ea2455891bab4207f3e7ae1fcbd0..271c58027e5091f559f5517ad223bab314eef480 100644 (file)
--- 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 832c86c4a51abdd99a35e01e1b7629d85b47a42f..94607bdf8c40f30db09853ac835b44431ee5a052 100644 (file)
--- 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 ec3444f1798cbdb1ae2aea81969c99ed1905b3d9..c32d2a02505265b536d59b20dd86f6d8c94447b8 100644 (file)
--- 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: