Skip to content

Commit

Permalink
selftests/mm: rename COW_EXTRA_LIBS to IOURING_EXTRA_LIBS
Browse files Browse the repository at this point in the history
The macro and facility can be reused in other tests too.  Make it general.

Link: https://lkml.kernel.org/r/20230417195317.898696-6-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Mika Penttilä <mpenttil@redhat.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Peter Xu authored and Andrew Morton committed Apr 21, 2023
1 parent cff2945 commit 71fc41e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tools/testing/selftests/mm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ warn_32bit_failure:
endif
endif

# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty.
$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS)
# IOURING_EXTRA_LIBS may get set in local_config.mk, or it may be left empty.
$(OUTPUT)/cow: LDLIBS += $(IOURING_EXTRA_LIBS)

$(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap

Expand All @@ -175,11 +175,11 @@ local_config.mk local_config.h: check_config.sh

EXTRA_CLEAN += local_config.mk local_config.h

ifeq ($(COW_EXTRA_LIBS),)
ifeq ($(IOURING_EXTRA_LIBS),)
all: warn_missing_liburing

warn_missing_liburing:
@echo ; \
echo "Warning: missing liburing support. Some COW tests will be skipped." ; \
echo "Warning: missing liburing support. Some tests will be skipped." ; \
echo
endif
4 changes: 2 additions & 2 deletions tools/testing/selftests/mm/check_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1

if [ -f $tmpfile_o ]; then
echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE
echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE
echo "IOURING_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE
else
echo "// No liburing support found" > $OUTPUT_H_FILE
echo "# No liburing support found, so:" > $OUTPUT_MKFILE
echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE
echo "IOURING_EXTRA_LIBS = " >> $OUTPUT_MKFILE
fi

rm ${tmpname}.*

0 comments on commit 71fc41e

Please sign in to comment.