Commit 5f9dd2e8 authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Shuah Khan

selftests: fix dependency checker script

This patch fixes inconsistencies in the parsing rules of the levels 1
and 2 of the kselftest_deps.sh.  It was added the levels 4 and 5 to
account for a few edge cases that are present in some tests, also some
minor identation styling have been fixed (s/    /\t/g).
Signed-off-by: default avatarRicardo B. Marliere <rbmarliere@gmail.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 9616cb34
...@@ -92,6 +92,10 @@ pass_cnt=0 ...@@ -92,6 +92,10 @@ pass_cnt=0
# Get all TARGETS from selftests Makefile # Get all TARGETS from selftests Makefile
targets=$(grep -E "^TARGETS +|^TARGETS =" Makefile | cut -d "=" -f2) targets=$(grep -E "^TARGETS +|^TARGETS =" Makefile | cut -d "=" -f2)
# Initially, in LDLIBS related lines, the dep checker needs
# to ignore lines containing the following strings:
filter="\$(VAR_LDLIBS)\|pkg-config\|PKG_CONFIG\|IOURING_EXTRA_LIBS"
# Single test case # Single test case
if [ $# -eq 2 ] if [ $# -eq 2 ]
then then
...@@ -100,6 +104,8 @@ then ...@@ -100,6 +104,8 @@ then
l1_test $test l1_test $test
l2_test $test l2_test $test
l3_test $test l3_test $test
l4_test $test
l5_test $test
print_results $1 $2 print_results $1 $2
exit $? exit $?
...@@ -113,7 +119,7 @@ fi ...@@ -113,7 +119,7 @@ fi
# Append space at the end of the list to append more tests. # Append space at the end of the list to append more tests.
l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \ l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \
grep -v "VAR_LDLIBS" | awk -F: '{print $1}') grep -v "$filter" | awk -F: '{print $1}' | uniq)
# Level 2: LDLIBS set dynamically. # Level 2: LDLIBS set dynamically.
# #
...@@ -126,7 +132,7 @@ l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \ ...@@ -126,7 +132,7 @@ l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \
# Append space at the end of the list to append more tests. # Append space at the end of the list to append more tests.
l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \ l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \
grep -v "VAR_LDLIBS" | awk -F: '{print $1}') grep -v "$filter" | awk -F: '{print $1}' | uniq)
# Level 3 # Level 3
# memfd and others use pkg-config to find mount and fuse libs # memfd and others use pkg-config to find mount and fuse libs
...@@ -138,11 +144,32 @@ l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \ ...@@ -138,11 +144,32 @@ l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \
# VAR_LDLIBS := $(shell pkg-config fuse --libs 2>/dev/null) # VAR_LDLIBS := $(shell pkg-config fuse --libs 2>/dev/null)
l3_tests=$(grep -r --include=Makefile "^VAR_LDLIBS" | \ l3_tests=$(grep -r --include=Makefile "^VAR_LDLIBS" | \
grep -v "pkg-config" | awk -F: '{print $1}') grep -v "pkg-config\|PKG_CONFIG" | awk -F: '{print $1}' | uniq)
#echo $l1_tests # Level 4
#echo $l2_1_tests # some tests may fall back to default using `|| echo -l<libname>`
#echo $l3_tests # if pkg-config doesn't find the libs, instead of using VAR_LDLIBS
# as per level 3 checks.
# e.g:
# netfilter/Makefile
# LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)
l4_tests=$(grep -r --include=Makefile "^LDLIBS" | \
grep "pkg-config\|PKG_CONFIG" | awk -F: '{print $1}' | uniq)
# Level 5
# some tests may use IOURING_EXTRA_LIBS to add extra libs to LDLIBS,
# which in turn may be defined in a sub-Makefile
# e.g.:
# mm/Makefile
# $(OUTPUT)/gup_longterm: LDLIBS += $(IOURING_EXTRA_LIBS)
l5_tests=$(grep -r --include=Makefile "LDLIBS +=.*\$(IOURING_EXTRA_LIBS)" | \
awk -F: '{print $1}' | uniq)
#echo l1_tests $l1_tests
#echo l2_tests $l2_tests
#echo l3_tests $l3_tests
#echo l4_tests $l4_tests
#echo l5_tests $l5_tests
all_tests all_tests
print_results $1 $2 print_results $1 $2
...@@ -164,24 +191,32 @@ all_tests() ...@@ -164,24 +191,32 @@ all_tests()
for test in $l3_tests; do for test in $l3_tests; do
l3_test $test l3_test $test
done done
for test in $l4_tests; do
l4_test $test
done
for test in $l5_tests; do
l5_test $test
done
} }
# Use same parsing used for l1_tests and pick libraries this time. # Use same parsing used for l1_tests and pick libraries this time.
l1_test() l1_test()
{ {
test_libs=$(grep --include=Makefile "^LDLIBS" $test | \ test_libs=$(grep --include=Makefile "^LDLIBS" $test | \
grep -v "VAR_LDLIBS" | \ grep -v "$filter" | \
sed -e 's/\:/ /' | \ sed -e 's/\:/ /' | \
sed -e 's/+/ /' | cut -d "=" -f 2) sed -e 's/+/ /' | cut -d "=" -f 2)
check_libs $test $test_libs check_libs $test $test_libs
} }
# Use same parsing used for l2__tests and pick libraries this time. # Use same parsing used for l2_tests and pick libraries this time.
l2_test() l2_test()
{ {
test_libs=$(grep --include=Makefile ": LDLIBS" $test | \ test_libs=$(grep --include=Makefile ": LDLIBS" $test | \
grep -v "VAR_LDLIBS" | \ grep -v "$filter" | \
sed -e 's/\:/ /' | sed -e 's/+/ /' | \ sed -e 's/\:/ /' | sed -e 's/+/ /' | \
cut -d "=" -f 2) cut -d "=" -f 2)
...@@ -197,6 +232,24 @@ l3_test() ...@@ -197,6 +232,24 @@ l3_test()
check_libs $test $test_libs check_libs $test $test_libs
} }
l4_test()
{
test_libs=$(grep --include=Makefile "^VAR_LDLIBS\|^LDLIBS" $test | \
grep "\(pkg-config\|PKG_CONFIG\).*|| echo " | \
sed -e 's/.*|| echo //' | sed -e 's/)$//')
check_libs $test $test_libs
}
l5_test()
{
tests=$(find $(dirname "$test") -type f -name "*.mk")
test_libs=$(grep "^IOURING_EXTRA_LIBS +\?=" $tests | \
cut -d "=" -f 2)
check_libs $test $test_libs
}
check_libs() check_libs()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment