From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D91642CFE; Mon, 19 Jun 2023 22:47:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16FED42C4D; Mon, 19 Jun 2023 22:47:02 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9383342C24 for ; Mon, 19 Jun 2023 22:47:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687207620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J+Y4xfp67euOVfZXkoldYGCMsD2zRImYmr5zvmnKFVE=; b=ZVX4w9FHEvWcpCFjU2rt6eNH9H1eiaiv+yuhrMsgJoi70DBt40BEzEpx0SHbOZUvPr++Pm Ero70ICo2vw2M6y1ahq2Pz3KRO/HdpC/mX2WwP8PYD5nfkWI0eUuuoyQtTNyZVuVhyrodC 3iJPDH1rDBwbRBv9/RRC6wAcADAnpNQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-ru9Ym7RDMs6sow31-KZLKw-1; Mon, 19 Jun 2023 16:46:58 -0400 X-MC-Unique: ru9Ym7RDMs6sow31-KZLKw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32543101A531 for ; Mon, 19 Jun 2023 20:46:58 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6FEA40C20F6 for ; Mon, 19 Jun 2023 20:46:57 +0000 (UTC) From: David Marchand To: dev@dpdk.org Subject: [PATCH 2/2] lib: make graph optional Date: Mon, 19 Jun 2023 22:46:50 +0200 Message-Id: <20230619204650.3348681-2-david.marchand@redhat.com> In-Reply-To: <20230619204650.3348681-1-david.marchand@redhat.com> References: <20230619204650.3348681-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Allow disabling of the graph library in builds. Signed-off-by: David Marchand --- app/test/meson.build | 12 +++++++----- lib/meson.build | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 35d6baeb22..c96488126f 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -61,8 +61,6 @@ test_sources = files( 'test_fib6.c', 'test_fib6_perf.c', 'test_func_reentrancy.c', - 'test_graph.c', - 'test_graph_perf.c', 'test_hash.c', 'test_hash_functions.c', 'test_hash_multiwriter.c', @@ -250,8 +248,6 @@ fast_tests = [ ['thash_autotest', true, true], ['threads_autotest', true, true], ['trace_autotest', true, true], - ['graph_autotest', true, true], - ['node_list_dump', true, true], ] # Tests known to have issues or which don't belong in other tests lists. @@ -300,7 +296,6 @@ perf_test_names = [ 'trace_perf_autotest', 'ipsec_perf_autotest', 'thash_perf_autotest', - 'graph_perf_autotest', ] driver_test_names = [ @@ -366,6 +361,13 @@ if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') test_sources += 'test_flow_classify.c' fast_tests += [['flow_classify_autotest', false, true]] endif +if dpdk_conf.has('RTE_LIB_GRAPH') + test_sources += 'test_graph.c' + fast_tests += [['graph_autotest', true, true]] + fast_tests += [['node_list_dump', true, true]] + test_sources += 'test_graph_perf.c' + perf_test_names += 'graph_perf_autotest' +endif if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index 9677239236..7310021833 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -72,6 +72,7 @@ optional_libs = [ 'cfgfile', 'flow_classify', 'gpudev', + 'graph', 'gro', 'gso', 'kni', -- 2.40.1