Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2025-08-22 19:04:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Travis: Run IBM TSS2 for coverage; use Bionic

Browse Source 
The IBM TSS2 is available starting with Bionic. Use it there
to extend the test coverage of the code.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2020-04-09 10:56:38 -04:00 committed by Stefan Berger
parent 3e7555c469
commit 0194fb22a5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -26,7 +26,6 @@ addons:
- libtasn1-dev - libtasn1-dev
- socat - socat
- findutils - findutils
- tpm-tools
- gnutls-dev - gnutls-dev
- gnutls-bin - gnutls-bin
- libasan2 - libasan2
@ -42,6 +41,11 @@ addons:
branch_pattern: coverity_scan branch_pattern: coverity_scan
before_install: before_install:
- test $TRAVIS_BRANCH != coverity_scan -o ${TRAVIS_JOB_NUMBER##*.} = 1 || exit 0 - test $TRAVIS_BRANCH != coverity_scan -o ${TRAVIS_JOB_NUMBER##*.} = 1 || exit 0
- |
if [ "$(uname -s)" = "Linux" ]; then
sudo rm -rf /dev/tpm* # This is a work-around for Bionic where trousers otherwise fails to install
sudo apt-get -y install trousers tpm-tools
fi
script: script:
- if [ ! -d libtpms ]; then git clone https://github.com/stefanberger/libtpms; fi - if [ ! -d libtpms ]; then git clone https://github.com/stefanberger/libtpms; fi
- cd libtpms - cd libtpms
@ -56,6 +60,7 @@ script:
- ./autogen.sh ${CONFIG} - ./autogen.sh ${CONFIG}
&& ${SUDO} make clean && ${SUDO} make clean
&& export SWTPM_TEST_EXPENSIVE=${SWTPM_TEST_EXPENSIVE:-1} && export SWTPM_TEST_EXPENSIVE=${SWTPM_TEST_EXPENSIVE:-1}
&& export SWTPM_TEST_IBMTSS2=${SWTPM_TEST_IBMTSS2:-0}
&& ${SUDO} make -j$(${NPROC:-nproc}) ${CHECK} VERBOSE=1 && ${SUDO} make -j$(${NPROC:-nproc}) ${CHECK} VERBOSE=1
- if [ -n "${RUN_TEST}" ]; then - if [ -n "${RUN_TEST}" ]; then
sudo make install sudo make install
@ -74,11 +79,14 @@ matrix:
RUN_TEST="1" RUN_TEST="1"
before_script: before_script:
- pep8 $(find . -type f | grep -E "\.py$") - pep8 $(find . -type f | grep -E "\.py$")
- env: PREFIX="/usr" - dist: bionic
env: PREFIX="/usr"
CONFIG="--with-openssl --prefix=/usr --enable-test-coverage" CONFIG="--with-openssl --prefix=/usr --enable-test-coverage"
SUDO="sudo" SUDO="sudo"
CHECK="check" CHECK="check"
SWTPM_TEST_IBMTSS2="1"
before_script: before_script:
- sudo apt-get -y install tss2
- sudo pip install cpp-coveralls - sudo pip install cpp-coveralls
- p=$PWD; while [ "$PWD" != "/" ]; do chmod o+x . &>/dev/null ; cd .. ; done; cd $p - p=$PWD; while [ "$PWD" != "/" ]; do chmod o+x . &>/dev/null ; cd .. ; done; cd $p
&& sudo mkdir src/swtpm/.libs && sudo mkdir src/swtpm/.libs

2
tests/test_tpm2_save_load_state_3
View File

@ -672,7 +672,7 @@ function test_primary_volatile_load()
export TPM_SERVER_TYPE=raw export TPM_SERVER_TYPE=raw
export TPM_SERVER_NAME=127.0.0.1 export TPM_SERVER_NAME=127.0.0.1
export TPM_INTERFACE_TYPE=socsim export TPM_INTERFACE_TYPE=socsim
export TPM_COMMAND_PORT=65533 export TPM_COMMAND_PORT=55533
export TPM_DATA_DIR=$TPMDIR export TPM_DATA_DIR=$TPMDIR
export TPM_SESSION_ENCKEY="807e2bfe898ddaed8fa6310e716a24dc" # for sessions export TPM_SESSION_ENCKEY="807e2bfe898ddaed8fa6310e716a24dc" # for sessions