tests/opencryptoki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix library paths

Browse source
This commit is contained in:
Karel Srot 2021-02-01 13:31:19 +01:00
commit 2d46c2c87d
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Library/token-manipulation/runtest.sh
View file

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

4
Sanity/init-token-as-a-nonroot-user/main.fmf
View file

@ -6,8 +6,8 @@ component:
test: ./runtest.sh
framework: beakerlib
require:
- library(distribution/nvr)
- library(opencryptoki/token-manipulation)
- library(nvr/nvr)
#- library(opencryptoki/token-manipulation) # not needed as it is in the same repo
recommend:
- opencryptoki
- opencryptoki-swtok

6
Sanity/init-token-as-a-nonroot-user/runtest.sh
View file

@ -36,10 +36,10 @@ TESTDIR=`pwd`
rlJournalStart
rlPhaseStartSetup
rlRun "rlImport distribution/nvr" || rlDie "cannot import distribution/nvr library"
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 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//'`
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//'`
echo "LIBPATH=$LIBPATH"
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"

4
Sanity/init-tokens-as-root/main.fmf
View file

@ -7,8 +7,8 @@ component:
test: ./runtest.sh
framework: beakerlib
require:
- library(distribution/nvr)
- library(opencryptoki/token-manipulation)
- library(nvr/nvr)
#- library(opencryptoki/token-manipulation) # not needed as it is in the same repo
recommend:
- opencryptoki
- opencryptoki-swtok

4
Sanity/init-tokens-as-root/runtest.sh
View file

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