From patchwork Mon Feb 2 14:45:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 44146 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0945D202A5 for ; Mon, 2 Feb 2015 14:46:29 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id fb4sf19299825wid.3 for ; Mon, 02 Feb 2015 06:46:28 -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=Nu0uqx9VEn9Vf14tQ1f66Br+S5gca0CnTgs6oCsWrKk=; b=gOSI5eprSCMDaHwMK1TbcjrnOWcC0q4uCao5NeU2J+uzBf+CpW8hlj3iFAe8EAsCLI E0cjcsfdQWPNmB0b5gWJP7rySxGtVxqShMde+HtELJsLx2j5L14Xr28qiHQ1V5oaSBAo laME+IUoJ18CZ5FUxsCuB9NqAxof+nemNdkskryTWKTs/41kKvwCa70D/rMgSRQuRL88 F3f4wqXw4I8o79h96ox99eBTmdvEkX5oj4nDj8RayDESTrTK84F8QsNE2ZFDJBL94VOp uqtmR8mgUR0Tl+xgUPHDSqYylQNutosYd9jMGJcdiotugwaAd2Q3L4jZEq3f3SgNR9F6 CXMw== X-Gm-Message-State: ALoCoQl9r8rTCxwE467YmxM/ZAPuIl/z2T+PI3OWU5wlIpbnxOfc+IfLAon9sj9l05z1LTVfGIUz X-Received: by 10.180.105.97 with SMTP id gl1mr1276484wib.7.1422888388329; Mon, 02 Feb 2015 06:46:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.11 with SMTP id lc11ls402424lac.19.gmail; Mon, 02 Feb 2015 06:46:28 -0800 (PST) X-Received: by 10.112.185.101 with SMTP id fb5mr19916749lbc.12.1422888388172; Mon, 02 Feb 2015 06:46:28 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id y9si17148688lbr.7.2015.02.02.06.46.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 06:46:28 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id s18so41628488lam.5 for ; Mon, 02 Feb 2015 06:46:28 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr19974386lbl.25.1422888388022; Mon, 02 Feb 2015 06:46:28 -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.35.133 with SMTP id h5csp1337693lbj; Mon, 2 Feb 2015 06:46:27 -0800 (PST) X-Received: by 10.229.102.68 with SMTP id f4mr766546qco.15.1422888386729; Mon, 02 Feb 2015 06:46:26 -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 t6si25329886qat.37.2015.02.02.06.46.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 06:46:26 -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 1YIIGc-0007KZ-6d; Mon, 02 Feb 2015 14:46:22 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YIIG8-0007JJ-5m for lng-odp@lists.linaro.org; Mon, 02 Feb 2015 14:45:52 +0000 Received: by mail-la0-f47.google.com with SMTP id hz20so41403493lab.6 for ; Mon, 02 Feb 2015 06:45:46 -0800 (PST) X-Received: by 10.113.11.12 with SMTP id ee12mr19616553lbd.79.1422888346324; Mon, 02 Feb 2015 06:45:46 -0800 (PST) Received: from localhost.localdomain (broadband-46-188-125-106.2com.net. [46.188.125.106]) by mx.google.com with ESMTPSA id l8sm3394689lag.24.2015.02.02.06.45.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 06:45:45 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 2 Feb 2015 17:45:41 +0300 Message-Id: <1422888341-6303-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] [PATCHv5] 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.215.46 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 Reviewed-by: Mike Holmes --- v5: tabs to spaces in odp_queue and odp_synchronizers line. test/validation/Makefile.am | 60 +++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 2942b85..acc5b83 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,33 +5,51 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} +EXECUTABLES = odp_buffer \ + odp_classification \ + odp_crypto \ + odp_init \ + odp_queue \ + odp_schedule \ + odp_shm \ + odp_system \ + odp_synchronizers \ + odp_time \ + odp_timer + +COMPILE_ONLY = odp_pktio + +TESTSCRIPTS = odp_pktio_run + if test_vald -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system odp_timer odp_time odp_synchronizers odp_classification +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) endif -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers odp_classification -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification +check_PROGRAMS = ${bin_PROGRAMS} -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 +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 -dist_odp_timer_SOURCES = odp_timer.c common/odp_cunit_common.c -dist_odp_time_SOURCES = odp_time.c common/odp_cunit_common.c -dist_odp_synchronizers_SOURCES = odp_synchronizers.c \ - common/odp_cunit_common.c + odp_buffer.c $(ODP_CU_COMMON) +odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification dist_odp_classification_SOURCES = classification/odp_classification_tests.c \ classification/odp_classification_basic.c \ - odp_classification.c common/odp_cunit_common.c + odp_classification.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_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) +dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON) +dist_odp_time_SOURCES = odp_time.c $(ODP_CU_COMMON) +dist_odp_timer_SOURCES = odp_timer.c $(ODP_CU_COMMON) +dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON)