improve regression tests: cleanup failed/ and out/ folder.
specify path to opensc-pkcs11.so module. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2887 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
5adad6431a
commit
807b4c7275
|
@ -8,3 +8,7 @@ EXTRA_DIST = \
|
||||||
init0007 init0008 init0009 init0010 init0011 init0012 \
|
init0007 init0008 init0009 init0010 init0011 init0012 \
|
||||||
pin0001 pin0002 \
|
pin0001 pin0002 \
|
||||||
erase functions README run-all test.p12
|
erase functions README run-all test.p12
|
||||||
|
|
||||||
|
# remove log files from regression tests
|
||||||
|
maintainer-clean-local:
|
||||||
|
rm -rf out failed
|
||||||
|
|
|
@ -15,6 +15,7 @@ if [ -z "$__p15init__" ]; then
|
||||||
p15init=$p15base/tools/pkcs15-init
|
p15init=$p15base/tools/pkcs15-init
|
||||||
p15dump=$p15base/tests/p15dump
|
p15dump=$p15base/tests/p15dump
|
||||||
p11tool=$p15base/tools/pkcs11-tool
|
p11tool=$p15base/tools/pkcs11-tool
|
||||||
|
p11module=$p15base/pkcs11/.libs/opensc-pkcs11.so
|
||||||
p15log=$p15temp/test.log
|
p15log=$p15temp/test.log
|
||||||
|
|
||||||
for bin in $osctool $p15tool $p15crypt $p15init $p11tool; do
|
for bin in $osctool $p15tool $p15crypt $p15init $p11tool; do
|
||||||
|
@ -325,6 +326,7 @@ function p15_validate {
|
||||||
run_display_output $p15dump < /dev/null
|
run_display_output $p15dump < /dev/null
|
||||||
msg "Validating card using pkcs11-tool"
|
msg "Validating card using pkcs11-tool"
|
||||||
run_display_output $p11tool -t --pin 0000 \
|
run_display_output $p11tool -t --pin 0000 \
|
||||||
|
--module $p11module \
|
||||||
--slot-label "OpenSC Test Card" $* < /dev/null
|
--slot-label "OpenSC Test Card" $* < /dev/null
|
||||||
success
|
success
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue