selftests/bpf: Exit with KSFT_SKIP if no Makefile found
authorLi Zhijian <lizhijian@cn.fujitsu.com>
Fri, 20 Aug 2021 02:55:49 +0000 (10:55 +0800)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 24 Aug 2021 21:01:10 +0000 (14:01 -0700)
This would happend when we run the tests after install kselftests
 root@lkp-skl-d01 ~# /kselftests/run_kselftest.sh -t bpf:test_doc_build.sh
 TAP version 13
 1..1
 # selftests: bpf: test_doc_build.sh
 perl: warning: Setting locale failed.
 perl: warning: Please check that your locale settings:
         LANGUAGE = (unset),
         LC_ALL = (unset),
         LC_ADDRESS = "en_US.UTF-8",
         LC_NAME = "en_US.UTF-8",
         LC_MONETARY = "en_US.UTF-8",
         LC_PAPER = "en_US.UTF-8",
         LC_IDENTIFICATION = "en_US.UTF-8",
         LC_TELEPHONE = "en_US.UTF-8",
         LC_MEASUREMENT = "en_US.UTF-8",
         LC_TIME = "en_US.UTF-8",
         LC_NUMERIC = "en_US.UTF-8",
         LANG = "en_US.UTF-8"
     are supported and installed on your system.
 perl: warning: Falling back to the standard locale ("C").
 # skip:    bpftool files not found!
 #
 ok 1 selftests: bpf: test_doc_build.sh # SKIP

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210820025549.28325-1-lizhijian@cn.fujitsu.com
tools/testing/selftests/bpf/test_bpftool_build.sh
tools/testing/selftests/bpf/test_doc_build.sh

index ac349a5..b03a875 100755 (executable)
@@ -22,7 +22,7 @@ KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../)
 cd $KDIR_ROOT_DIR
 if [ ! -e tools/bpf/bpftool/Makefile ]; then
        echo -e "skip:    bpftool files not found!\n"
-       exit 0
+       exit 4 # KSFT_SKIP=4
 fi
 
 ERROR=0
index d67ced9..679cf96 100755 (executable)
@@ -10,6 +10,11 @@ KDIR_ROOT_DIR=$(realpath $SCRIPT_REL_DIR/../../../../)
 SCRIPT_REL_DIR=$(dirname $(realpath --relative-to=$KDIR_ROOT_DIR $SCRIPT_REL_PATH))
 cd $KDIR_ROOT_DIR
 
+if [ ! -e $PWD/$SCRIPT_REL_DIR/Makefile ]; then
+       echo -e "skip:    bpftool files not found!\n"
+       exit 4 # KSFT_SKIP=4
+fi
+
 for tgt in docs docs-clean; do
        make -s -C $PWD/$SCRIPT_REL_DIR $tgt;
 done