From 663f66decf4cc0761c0cd6ead53fd146ffd166ff Mon Sep 17 00:00:00 2001
From: Andrii Nakryiko <andriin@fb.com>
Date: Thu, 6 Aug 2020 21:30:15 -0700
Subject: [PATCH] vmtests: blacklist problematic tests

Blacklist btf_map_in_map permanently for 5.5. bpf_verif_scale is broken due to
Clang issues on latest. Do not run ALU32 flavor for test_progs on 4.9.0, which
doesn't support ALU32 yet.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
 travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0  | 1 +
 travis-ci/vmtest/configs/blacklist/BLACKLIST-latest | 1 +
 travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0  | 1 +
 travis-ci/vmtest/run_selftests.sh                   | 6 ++++--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0 b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
index 05d2df9..b883a8a 100644
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
@@ -9,6 +9,7 @@ bpf_verif_scale
 #bpf_verif_scale/strobemeta.o
 #bpf_verif_scale/strobemeta_nounroll1.o
 #bpf_verif_scale/strobemeta_nounroll2.o
+btf_map_in_map		# inner map leak fixed in 5.8
 
 cg_storage_multi	# v5.9+ functionality
 cgroup_attach_multi	# BPF_F_REPLACE_PROG missing
diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest b/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
index ef2034d..897f6ab 100644
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
@@ -4,3 +4,4 @@ test_lsm		# semi-working
 sk_assign		# needs better setup in Travis CI
 sk_lookup
 core_reloc		# temporary test breakage
+bpf_verif_scale		# clang regression
diff --git a/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0 b/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
index d2bb75c..e987ffa 100644
--- a/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
+++ b/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
@@ -4,3 +4,4 @@ cpu_mask
 hashmap
 perf_buffer
 section_names
+
diff --git a/travis-ci/vmtest/run_selftests.sh b/travis-ci/vmtest/run_selftests.sh
index ff9c422..2e8a4c0 100755
--- a/travis-ci/vmtest/run_selftests.sh
+++ b/travis-ci/vmtest/run_selftests.sh
@@ -3,8 +3,10 @@
 set -euxo pipefail
 
 test_progs() {
-	echo TEST_PROGS
-	./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
+	if [[ "${KERNEL}" != '4.9.0' ]]; then
+		echo TEST_PROGS
+		./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
+	fi
 
 	echo TEST_PROGS-NO_ALU32
 	./test_progs-no_alu32 ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}