Running the "boot_aggregate" test without a physical TPM, requires
installing and initializing a software TPM. For now, use the same
method of initializing the TPM, based on the IBM tss, for both the
IBM and Intel's tss.
Build both the IBM and INTEL's tss.
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxx>
---
.travis.yml | 17 ++++++++++++++++-
tests/install-tpm2-tss.sh | 19 +++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100755 tests/install-tpm2-tss.sh
diff --git a/.travis.yml b/.travis.yml
index 0a3476572f74..11a827c02f0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,27 @@ addons:
- xsltproc
- docbook-xsl
- docbook-xml
+matrix:
+ include:
+ - env: TSS=ibmtss
+ - env: TSS=tpm2-tss
install:
+ - if [ "${TSS}" = "tpm2-tss" ]; then
+ sudo apt-get install lcov pandoc autoconf-archive liburiparser-dev;
+ sudo apt-get install libdbus-1-dev libglib2.0-dev dbus-x11 libgcrypt-dev;
+ sudo apt-get install libssl-dev doxygen libjson-c-dev;
+ sudo apt-get install libini-config-dev libltdl-dev;
+ sudo apt-get install uuid-dev libcurl4-openssl-dev;
+ ./tests/install-tpm2-tss.sh;
+ fi
- ./tests/install-swtpm.sh
- ./tests/install-tss.sh
+
script:
+ - export LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib;
+ - export PATH=$PATH:/usr/local/bin;
- autoreconf -i && ./configure && make -j$(nproc) && sudo make install && VERBOSE=1 make check;
- tail -3 tests/ima_hash.log;
- tail -3 tests/sign_verify.log;
- - tail -3 tests/boot_aggregate.log;
+ - tail -20 tests/boot_aggregate.log;
diff --git a/tests/install-tpm2-tss.sh b/tests/install-tpm2-tss.sh
new file mode 100755
index 000000000000..7a71b57a8729
--- /dev/null
+++ b/tests/install-tpm2-tss.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+git clone https://github.com/tpm2-software/tpm2-tss.git
+cd tpm2-tss
+./bootstrap
+./configure
+make -j$(nproc)
+sudo make install
+sudo ldconfig
+cd ..
+rm -rf tpm2-tss
+
+git clone https://github.com/tpm2-software/tpm2-tools.git
+cd tpm2-tools
+./bootstrap && ./configure --prefix=/usr
+make -j$(nproc)
+sudo make install
+cd ..
+rm -rf tpm2-tools
--
2.18.4
