tests/pkcs11-tool: Use pre-built packages from copr

tests/pkcs11-tool/Makefile

@@ -53,11 +53,9 @@ $(METADATA): Makefile
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        15m" >> $(METADATA)
 	@echo "RunFor:          opensc" >> $(METADATA)
-	@echo "Requires:        opensc openssl gnutls-utils" >> $(METADATA)
+	@echo "Requires:        opensc openssl gnutls-utils libcacard" >> $(METADATA)
 	@echo "Requires:        opencryptoki-libs opencryptoki opencryptoki-swtok" >> $(METADATA)
-	@echo "Requires:        libcacard-devel autoconf" >> $(METADATA)
-	@echo "Requires:        autoconf-archive automake libtool" >> $(METADATA)
-	@echo "Requires:        softhsm help2man pcsc-lite-devel nss-tools policycoreutils" >> $(METADATA)
+	@echo "Requires:        softhsm nss-tools policycoreutils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2+" >> $(METADATA)
 	@echo "Confidential:    yes" >> $(METADATA)

tests/pkcs11-tool/runtest.sh

@@ -115,16 +115,9 @@ function card_setup() {
                 rlRun "modutil -force -add 'SoftHSM PKCS#11' -dbdir sql:$NSSDB -libfile $P11LIB"
             fi
 
-            # Download and Install vsmartcard
-            rlRun "git clone https://github.com/frankmorgner/vsmartcard.git"
-            rlRun "pushd vsmartcard/virtualsmartcard"
-            rlRun "autoreconf -vis && ./configure && make -j4 && make install"
-            rlRun "popd"
-
-            # Download and Install virt_cacard
-            rlRun "git clone https://github.com/PL4typus/virt_cacard.git"
-            rlRun "pushd virt_cacard && ./autogen.sh && ./configure && make"
-            rlRun "popd"
+            # Download and Install vsmartcard and virt_cacard
+            rlRun "yes | dnf copr enable jjelen/vsmartcard"
+            rlRun "dnf install -y virt_cacard virtualsmartcard"
 
             # Install the temporary SELinux policy
             rlRun "semodule -i virtcacard.cil"
@@ -134,7 +127,7 @@ function card_setup() {
 
             # Start virtcacard
             #rlRun "G_MESSAGES_DEBUG=libcacard LIBCACARD_DEBUG=1 ./virt_cacard/virt_cacard 2> virt_cacard.debug &"
-            rlRun "./virt_cacard/virt_cacard 2> virt_cacard.debug &"
+            rlRun "/usr/bin/virt_cacard 2> virt_cacard.debug &"
             rlRun "sleep 5"
 
             # We will use OpenSC directly from here

tests/tests.yml

@@ -22,15 +22,8 @@
     - opencryptoki-libs # opencryptoki
     - opencryptoki
     - opencryptoki-swtok
-    - git               # to download vsmartcard and virt_cacard projects
-    - libcacard-devel   # Build requires for virt_cacard and vsmartcard
-    - autoconf
-    - autoconf-archive
-    - automake
-    - libtool
+    - libcacard
     - softhsm
-    - help2man
-    - pcsc-lite-devel
     - nss-tools         # Handling NSS DB
     - policycoreutils   # Loading custom selinux modules