From patchwork Mon Dec 29 14:19:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 42641 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D6EB025B8B for ; Mon, 29 Dec 2014 14:20:00 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf8095381wgh.9 for ; Mon, 29 Dec 2014 06:20:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=OQsBx1PGSbeI+f9TYlDrBq3g2A7z2PKTQmre2pXOSzY=; b=AAniYIM0R0YpDF6C+gZrWWv2v5FXpivEXZ8E/BsIPq7ufaL6UQCRybiSGn3ZuzymbN l7HvVglmsdiZJksDQUoDBX53Hb5hhI2+rTbeIMJdQOMtuX94WtAUGkhsCQ0GplAV0f4r c98MVaS3w8HZNmYkh9hpT4AAyhbZlOKa47Nu+H/nsgJ0Wl+vOPEn5QLQkNwJDfkxnqS6 PgbbEVo/OemzM4TGPe1pjt+qtFNHmYJKsvgP/n4B2SKmXfh51nrq5+jI/nb49NaQKFIC zAN/hvbGCRCssA2Gwa11HwbLK9Wv2hSxxJC96S1Myq+cYeW5nDfX0BasJ75RVQfr7Qvt 4npg== X-Gm-Message-State: ALoCoQkLi6zhGHAFV3hpEG2yPUrBxcFgLPHRoaiUWV6HQjs7BZd9WjZL9gZK51g/Vg1H5QIEXBaL X-Received: by 10.112.235.231 with SMTP id up7mr6629474lbc.0.1419862800113; Mon, 29 Dec 2014 06:20:00 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.40 with SMTP id h8ls173537lah.12.gmail; Mon, 29 Dec 2014 06:19:59 -0800 (PST) X-Received: by 10.152.19.7 with SMTP id a7mr56446362lae.16.1419862799969; Mon, 29 Dec 2014 06:19:59 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id tv7si39657349lbb.83.2014.12.29.06.19.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Dec 2014 06:19:59 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id b6so10543209lbj.8 for ; Mon, 29 Dec 2014 06:19:59 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr57403082laa.80.1419862799853; Mon, 29 Dec 2014 06:19:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp2796241lbb; Mon, 29 Dec 2014 06:19:58 -0800 (PST) X-Received: by 10.229.97.73 with SMTP id k9mr91130178qcn.15.1419862797791; Mon, 29 Dec 2014 06:19:57 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id t4si40378030qar.11.2014.12.29.06.19.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Dec 2014 06:19:57 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y5bAm-0005qw-Ni; Mon, 29 Dec 2014 14:19:52 +0000 Received: from mail-la0-f46.google.com ([209.85.215.46]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y5bAf-0005qr-OA for lng-odp@lists.linaro.org; Mon, 29 Dec 2014 14:19:45 +0000 Received: by mail-la0-f46.google.com with SMTP id q1so11187478lam.5 for ; Mon, 29 Dec 2014 06:19:40 -0800 (PST) X-Received: by 10.112.167.228 with SMTP id zr4mr57116627lbb.20.1419862779671; Mon, 29 Dec 2014 06:19:39 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id c5sm9974203laa.34.2014.12.29.06.19.38 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Dec 2014 06:19:38 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 29 Dec 2014 17:19:32 +0300 Message-Id: <1419862772-23660-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 X-Topics: patch Subject: [lng-odp] [PATCHv2] validation: reorder Makefile.am X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 1. Reorder programs in Makefile.am to be in alphabetical order. 2. Put common source to variable. 3. Put source names on separate line to have less merge conflicts. Signed-off-by: Maxim Uvarov --- v2: put scripts to variable list. test/validation/Makefile.am | 53 +++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index c0545b7..5a12ac9 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -4,26 +4,47 @@ AM_CFLAGS += -I$(srcdir)/common AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} +# +# BINS - list to compile and execute with make check +# +BINS = odp_buffer \ + odp_crypto \ + odp_init \ + odp_queue \ + odp_schedule \ + odp_shm \ + odp_system +# +# BINS_COMPILE - list to compile only +# +BINS_COMPILE = odp_pktio +# +# TSCRIPTS - list of scripts to be executed with make check +# +TSCRIPTS = odp_pktio_run if ODP_CUNIT_ENABLED -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system -check_PROGRAMS = ${bin_PROGRAMS} -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer +TESTS = $(BINS) $(TSCRIPTS) +bin_PROGRAMS = $(BINS) $(BINS_COMPILE) endif -dist_odp_init_SOURCES = odp_init.c -dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c -dist_odp_queue_SOURCES = odp_queue.c common/odp_cunit_common.c -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ - crypto/odp_crypto_test_sync_inp.c \ - crypto/odp_crypto_test_rng.c \ - odp_crypto.c common/odp_cunit_common.c -dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c -dist_odp_schedule_SOURCES = odp_schedule.c common/odp_cunit_common.c +check_PROGRAMS = ${bin_PROGRAMS} + +ODP_CU_COMMON=common/odp_cunit_common.c + +odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer dist_odp_buffer_SOURCES = buffer/odp_buffer_pool_test.c \ buffer/odp_buffer_test.c \ buffer/odp_packet_test.c \ - odp_buffer.c common/odp_cunit_common.c -dist_odp_system_SOURCES = odp_system.c common/odp_cunit_common.c + odp_buffer.c $(ODP_CU_COMMON) +odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto +dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ + crypto/odp_crypto_test_sync_inp.c \ + crypto/odp_crypto_test_rng.c \ + odp_crypto.c $(ODP_CU_COMMON) +dist_odp_init_SOURCES = odp_init.c +dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) +dist_odp_queue_SOURCES = odp_queue.c $(ODP_CU_COMMON) +dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON) +dist_odp_shm_SOURCES = odp_shm.c $(ODP_CU_COMMON) +dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)