From patchwork Mon Jan 14 13:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 10762601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30FA813B4 for ; Mon, 14 Jan 2019 13:52:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2202728BAB for ; Mon, 14 Jan 2019 13:52:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 165E628BE8; Mon, 14 Jan 2019 13:52:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5BCA28BAB for ; Mon, 14 Jan 2019 13:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726747AbfANNv6 (ORCPT ); Mon, 14 Jan 2019 08:51:58 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:51426 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726674AbfANNvt (ORCPT ); Mon, 14 Jan 2019 08:51:49 -0500 Received: from ramsan ([84.194.111.163]) by andre.telenet-ops.be with bizsmtp id QDrm1z0053XaVaC01DrmK5; Mon, 14 Jan 2019 14:51:47 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1gj2eY-0000Ef-1e; Mon, 14 Jan 2019 14:51:46 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1gj2eY-0006o3-00; Mon, 14 Jan 2019 14:51:46 +0100 From: Geert Uytterhoeven To: Shuah Khan , Masahiro Yamada , Michal Marek Cc: Jonathan Corbet , Bamvor Jian Zhang , Kees Cook , linux-kselftest@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 04/12] selftests: android: ion: Fix ionmap_test dependencies Date: Mon, 14 Jan 2019 14:51:36 +0100 Message-Id: <20190114135144.26096-5-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114135144.26096-1-geert+renesas@glider.be> References: <20190114135144.26096-1-geert+renesas@glider.be> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building kselftest in a separate output directory: /tmp/cc44s4yX.o: In function `socket_send_fd': tools/testing/selftests/android/ion/ionutils.c:221: undefined reference to `sendtosocket' /tmp/cc44s4yX.o: In function `socket_receive_fd': tools/testing/selftests/android/ion/ionutils.c:243: undefined reference to `receivefromsocket' The dependencies for the various test programs are expressed twice: 1. Once using $(TEST_GEN_FILES), which supports building in the source directory only, 2. A second time using $(OUTPUT), which supports building in either the source or build directory, but lacks a dependency of ionmap_test on ipcsocket, causing the link error above. Fix this by: - Adding the missing dependency to 2, - Dropping superfluous rule 1. Remove the "all" target while at it, as that is already handled by the included lib.mk. Fixes: ac93f7046a5371ff ("selftests: ion: Add simple test with the vgem driver") Signed-off-by: Geert Uytterhoeven --- tools/testing/selftests/android/ion/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile index 88cfe88e466fb0e6..ce05c5f3594bcf87 100644 --- a/tools/testing/selftests/android/ion/Makefile +++ b/tools/testing/selftests/android/ion/Makefile @@ -4,10 +4,6 @@ CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test -all: $(TEST_GEN_FILES) - -$(TEST_GEN_FILES): ipcsocket.c ionutils.c - TEST_PROGS := ion_test.sh KSFT_KHDR_INSTALL := 1 @@ -16,4 +12,4 @@ include ../../lib.mk $(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c $(OUTPUT)/ionapp_import: ionapp_import.c ipcsocket.c ionutils.c -$(OUTPUT)/ionmap_test: ionmap_test.c ionutils.c +$(OUTPUT)/ionmap_test: ionmap_test.c ipcsocket.c ionutils.c