From patchwork Mon Feb 2 16:23:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 44159 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 507132034D for ; Mon, 2 Feb 2015 16:23:43 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf16992202lab.1 for ; Mon, 02 Feb 2015 08:23:42 -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=+8McileA8WLz4ERqxvAmEWY9aqQ7ojzNzoKDriQnm1E=; b=OfovsiR7FPo6QIPL5nwBUkNyuvL1WvL+Z/IJceRr4XjRmK1gIGSKXZDfFSFleA7PEc gppurUN0S9INarPIziYiUka6PUV3931Pr6vENarzFg+KRqcxhsgcQKxnIWB3zgAl1BHJ S9TKR7B3bvPGIbXnMaZO+nejZ1zW5P5rPOHyaC1YPQTcqf6mvKmZgBuYl9U4LEJ6QEt4 4tNll7tEPAUo2ukj2jejFq5VQZWwhOh4Cw/aYXT5IBylgKDhw4IyL2KdLoqB38hkr9GF 1hHL3JQZGOgFgoCHD+lbd6UiyHLMW6oa6mAWjCaG3GSSKWEGWdXQ33RLMkBh84SWG8Gx X8Kw== X-Gm-Message-State: ALoCoQlPa9DI6girKcDs8tafFybYqWR0Chni3U7NvbZuWD9H8ZO3Zsc8IxJl/kwftGdtt5AqF5VQ X-Received: by 10.112.133.98 with SMTP id pb2mr2542623lbb.2.1422894222108; Mon, 02 Feb 2015 08:23:42 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.164 with SMTP id wr4ls263815lac.79.gmail; Mon, 02 Feb 2015 08:23:41 -0800 (PST) X-Received: by 10.112.202.227 with SMTP id kl3mr6188296lbc.81.1422894221957; Mon, 02 Feb 2015 08:23:41 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id py9si17249059lbb.135.2015.02.02.08.23.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 08:23:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id q1so42592759lam.2 for ; Mon, 02 Feb 2015 08:23:41 -0800 (PST) X-Received: by 10.112.122.52 with SMTP id lp20mr13829846lbb.98.1422894220365; Mon, 02 Feb 2015 08:23:40 -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 h5csp1396775lbj; Mon, 2 Feb 2015 08:23:39 -0800 (PST) X-Received: by 10.236.19.71 with SMTP id m47mr8601418yhm.106.1422894219009; Mon, 02 Feb 2015 08:23:39 -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 m5si1734839yka.89.2015.02.02.08.23.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 08:23:38 -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 1YIJmg-0003s1-Gm; Mon, 02 Feb 2015 16:23:34 +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 1YIJmb-0003re-33 for lng-odp@lists.linaro.org; Mon, 02 Feb 2015 16:23:29 +0000 Received: by mail-la0-f47.google.com with SMTP id hz20so42481067lab.6 for ; Mon, 02 Feb 2015 08:23:23 -0800 (PST) X-Received: by 10.112.54.167 with SMTP id k7mr20140585lbp.72.1422894203249; Mon, 02 Feb 2015 08:23:23 -0800 (PST) Received: from localhost.localdomain (broadband-46-188-125-106.2com.net. [46.188.125.106]) by mx.google.com with ESMTPSA id rp6sm4504125lbb.4.2015.02.02.08.23.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 08:23:22 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 2 Feb 2015 19:23:16 +0300 Message-Id: <1422894196-12807-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] [PATCHv6] 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.43 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 --- v6: move bin_PROGRAMS out of "if test_vald" to their original place. test/validation/Makefile.am | 59 +++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 2942b85..0cdeacb 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,33 +5,50 @@ 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) 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 +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -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)