use url to opencryptoli library in the end

This commit is contained in:
Karel Srot 2021-02-01 13:58:41 +01:00
commit d9102b28ad
6 changed files with 11 additions and 6 deletions

View file

@ -4,6 +4,9 @@ contact: Karel Srot <ksrot@redhat.com>
component: []
test: ./runtest.sh
framework: beakerlib
require:
- url: https://src.fedoraproject.org/tests/opencryptoki.git
name: /Library/token-manipulation
recommend:
- opencryptoki
- opencryptoki-swtok

View file

@ -34,7 +34,7 @@ PHASE=${PHASE:-Test}
rlJournalStart
rlPhaseStartSetup
rlRun "rlImport ./token-manipulation"
rlRun "rlImport opencryptoki/token-manipulation"
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir"
rlPhaseEnd

View file

@ -7,7 +7,8 @@ test: ./runtest.sh
framework: beakerlib
require:
- library(nvr/nvr)
#- library(opencryptoki/token-manipulation) # not needed as it is in the same repo
- url: https://src.fedoraproject.org/tests/opencryptoki.git
name: /Library/token-manipulation
recommend:
- opencryptoki
- opencryptoki-swtok

View file

@ -38,8 +38,8 @@ rlJournalStart
rlPhaseStartSetup
rlRun "rlImport nvr/nvr" || rlDie "cannot import distribution/nvr library"
# need to find out the library path so a user can import it too
rlRun "rlImport ./token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library"
LIBPATH=`grep 'Will try to import .\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'`
rlRun "rlImport opencryptoki/token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library"
LIBPATH=`grep 'Will try to import opencryptoki\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'`
echo "LIBPATH=$LIBPATH"
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"

View file

@ -8,7 +8,8 @@ test: ./runtest.sh
framework: beakerlib
require:
- library(nvr/nvr)
#- library(opencryptoki/token-manipulation) # not needed as it is in the same repo
- url: https://src.fedoraproject.org/tests/opencryptoki.git
name: /Library/token-manipulation
recommend:
- opencryptoki
- opencryptoki-swtok

View file

@ -35,7 +35,7 @@ TESTDIR=`pwd`
rlJournalStart
rlPhaseStartSetup
rlRun "rlImport nvr/nvr" || rlDie "cannot import distribution/nvr library"
rlRun "rlImport ./token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
rlRun "rlImport opencryptoki/token-manipulation" || rlDie "Could not import opencryptoki/token-manipulation library"
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir"