From patchwork Fri Sep 8 15:14:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9944479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AEC5860224 for ; Fri, 8 Sep 2017 15:15:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B21B7287E6 for ; Fri, 8 Sep 2017 15:15:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6FAB287E7; Fri, 8 Sep 2017 15:15:10 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1F39E287EF for ; Fri, 8 Sep 2017 15:15:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B828E6EBBF; Fri, 8 Sep 2017 15:15:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 44F7F6EBB7 for ; Fri, 8 Sep 2017 15:14:58 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id f4so1933063wmh.4 for ; Fri, 08 Sep 2017 08:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qNdB/SvdyCI650T2TAlYI3uud+C30HGz1tJrHK8aoCU=; b=RCXvVDnz2FlU9WL3ciPcc2cl9qMNlns1fxABold9KxGnhpNd71YwXmFf4xtJJ8BkXv KfuRlHk+vJdbWKoupPJuM/qOayKpRCtDT9DrEoEDbj++zygIMxBD2d9zMFe8kIxM7ciV lsL6oO0WPcu4z+cgAq/ltJD0eVLJGAFfZlIXY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qNdB/SvdyCI650T2TAlYI3uud+C30HGz1tJrHK8aoCU=; b=uAjL5lQlSnLDS+gqFcHRysCamgUFFRwr7WnDGVYDz71LsvVp8lTwD92MaSHNTY+lA6 xvjF5iw7DLhHUZSdgGQ8YDaAaw071K33XYyMj2/MMwWSUes7fA+81+97NLHtwUplt3vy fdbIt1FQ8NWq73MZMhvtTdMviop8y9azFRLGK/qwKPXHTsov+k2HZxTQiS6pbvVaEsyJ gqeI3jDIDCsE4AzWFX1BADo7tFj8OZfoxh/UiKpLQvcjvLSszZDcUn+9AIJjmDtfcMrL +Le4exTWNcGkx+w36TsBGUQrfcIYKhnz1TLeQA3Z4Gd8ysi8wBMcYqt1GQp3n65GC97S ZkPA== X-Gm-Message-State: AHPjjUgDWPNPOrlatLil6kCkNeoFr84gHjaFSvYoXiBoxVBxvlIPiLcO mM7kUwwYLmOHLJFHBPI= X-Google-Smtp-Source: ADKCNb7oVjktNKRwkqsNFfOOsYuGg0YVbSfl3x9sbZI0hkEe7hJ3T8JudStPRWcKCQ8SrJ5mDZZBPQ== X-Received: by 10.80.164.87 with SMTP id v23mr1523855edb.99.1504883696393; Fri, 08 Sep 2017 08:14:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id s29sm808105edb.51.2017.09.08.08.14.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 08:14:55 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 8 Sep 2017 17:14:47 +0200 Message-Id: <20170908151448.15356-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170908151448.15356-1-daniel.vetter@ffwll.ch> References: <20170908151448.15356-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH i-g-t 2/3] meson: align test-list.txt generation with automake X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP - I forgot the chamelium tests - Order tests the same way in both build systems. Since testdisplay is special, it's easier to put that at the end in meson, so adjusted automake to suit. With this you can diff the 2 test lists and end up with 0 differences, which will be useful to CI meson vs. automake. Signed-off-by: Daniel Vetter --- tests/Makefile.am | 1 + tests/Makefile.sources | 2 -- tests/generate_testlist.sh | 9 +++++++-- tests/meson.build | 20 ++++++++++++++------ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c70f6f1aa35..39ca3960355c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ TESTS_progs += \ $(NULL) endif +TESTS_progs += testdisplay if BUILD_TESTS test-list.txt: Makefile.sources diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 0f4e39af10a1..caec5486e49f 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -281,8 +281,6 @@ testdisplay_SOURCES = \ testdisplay_hotplug.c \ $(NULL) -TESTS_progs += testdisplay - check_SCRIPTS = igt_command_line.sh \ $(NULL) diff --git a/tests/generate_testlist.sh b/tests/generate_testlist.sh index 6ea78655daca..e3cb87f98842 100755 --- a/tests/generate_testlist.sh +++ b/tests/generate_testlist.sh @@ -2,9 +2,14 @@ echo TESTLIST > $MESON_BUILD_ROOT/tests/test-list.txt +if [[ $# -gt 0 ]] ; then + echo -n $1 >> $MESON_BUILD_ROOT/tests/test-list.txt + shift +fi + while [[ $# -gt 0 ]] ; do - echo $1 >> $MESON_BUILD_ROOT/tests/test-list.txt + echo -n " $1" >> $MESON_BUILD_ROOT/tests/test-list.txt shift done -echo END TESTLIST >> $MESON_BUILD_ROOT/tests/test-list.txt +echo -e "\nEND TESTLIST" >> $MESON_BUILD_ROOT/tests/test-list.txt diff --git a/tests/meson.build b/tests/meson.build index 4dd5a9c9d4c7..1a323f7c51d6 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -218,6 +218,17 @@ test_progs = [ ] test_deps = [ igt_deps ] + +if libdrm_amdgpu.found() + # FIXME meson/ninja really doesn't like build targets with paths in them + test_progs += [ + 'amdgpu/amd_basic', + 'amdgpu/amd_cs_nop', + 'amdgpu/amd_prime', + ] + test_deps += libdrm_amdgpu +endif + if libdrm_nouveau.found() test_progs += [ 'prime_nv_api', @@ -238,14 +249,11 @@ if libdrm_vc4.found() test_deps += libdrm_vc4 endif -if libdrm_amdgpu.found() - # FIXME meson/ninja really doesn't like build targets with paths in them +if chamelium.found() test_progs += [ - 'amdgpu/amd_basic', - 'amdgpu/amd_cs_nop', - 'amdgpu/amd_prime', + 'chamelium', ] - test_deps += libdrm_amdgpu + test_deps += chamelium endif if alsa.found() and gsl.found()