From 50febacba11917f2d9bc17c1978c9504128fdb00 Mon Sep 17 00:00:00 2001
From: Julia Kartseva <hex@fb.com>
Date: Wed, 26 Feb 2020 15:18:09 -0800
Subject: [PATCH] vmtest: disk image update; run test_{maps|verifier};
 blacklist update

The disk image is updated to 2020-03-11.

blacklist for LATEST kernel:
attach_probe (needs root cause)
perf_buffer (needs root cause)
send_signal (flaky)
sockmap_listen (flaky)

Run test_maps and test_verifier.
test_maps is not expected to pass for kernels other then LATEST.

Signed-off-by: Julia Kartseva (hex@fb.com)
---
 travis-ci/vmtest/configs/INDEX                |  2 +-
 .../vmtest/configs/blacklist/BLACKLIST-5.5.0  |  7 ++---
 .../vmtest/configs/blacklist/BLACKLIST-latest |  8 ++---
 travis-ci/vmtest/run_selftests.sh             | 31 +++++++++++++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/travis-ci/vmtest/configs/INDEX b/travis-ci/vmtest/configs/INDEX
index 771f49a..5dcccde 100644
--- a/travis-ci/vmtest/configs/INDEX
+++ b/travis-ci/vmtest/configs/INDEX
@@ -1,5 +1,5 @@
 INDEX	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/INDEX
-libbpf-vmtest-rootfs-2020.01.10.tar.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/libbpf-vmtest-rootfs-2020.01.10.tar.zst
+libbpf-vmtest-rootfs-2020.03.11.tar.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/libbpf-vmtest-rootfs-2020.03.11.tar.zst
 vmlinux-5.5.0-rc6.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinux-5.5.0-rc6.zst
 vmlinux-5.5.0.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinux-5.5.0.zst
 vmlinuz-5.5.0-rc6	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinuz-5.5.0-rc6
diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0 b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
index a5bb1a5..d2b8523 100644
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
@@ -1,13 +1,12 @@
+attach_multi
+attach_probe
 bpf_tcp_ca
-cgroup_attach_multi
 fexit_bpf2bpf
 link_pinning
 perf_branches
+perf_buffer
 select_reuseport
 send_signal
 skb_ctx
 sockmap_listen
-sockopt_inherit
-spinlock
-tcp_rtt
 test_global_funcs
diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest b/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
index db1e7bf..b4b4d40 100644
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
@@ -1,6 +1,4 @@
-send_signal_tracepoint
-send_signal_tracepoint_thread
+attach_probe
+perf_buffer
+send_signal
 sockmap_listen
-sockopt_inherit
-spinlock
-tcp_rtt
diff --git a/travis-ci/vmtest/run_selftests.sh b/travis-ci/vmtest/run_selftests.sh
index b767310..910519a 100755
--- a/travis-ci/vmtest/run_selftests.sh
+++ b/travis-ci/vmtest/run_selftests.sh
@@ -1,11 +1,22 @@
 #!/bin/bash
 
-set -eux
+set -euxo pipefail
 
-mount -t bpf bpffs /sys/fs/bpf
-mount -t debugfs none /sys/kernel/debug/
+test_progs() {
+	echo TEST_PROGS
+	./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
+}
 
-ip link set lo up
+test_maps() {
+	echo TEST_MAPS
+	# Allow failing on older kernels.
+	./test_maps || [ ${KERNEL} != 'LATEST' ]
+}
+
+test_verifier() {
+	echo TEST_VERIFIER
+	./test_verifier
+}
 
 configs_path='libbpf/travis-ci/vmtest/configs'
 blacklist_path="$configs_path/blacklist/BLACKLIST-${KERNEL}"
@@ -20,5 +31,13 @@ fi
 
 cd libbpf/selftests/bpf
 
-echo TEST_PROGS
-./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
+set +e
+exitcode=0
+for test_func in test_progs test_maps test_verifier; do
+	${test_func}; c=$?
+	if [[ $c -ne 0 ]]; then
+		exitcode=$c
+	fi
+done
+
+exit $exitcode