From commits-return-6731-archive-asf-public=cust-asf.ponee.io@kudu.apache.org Thu Nov 8 18:01:28 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9809B180671 for ; Thu, 8 Nov 2018 18:01:27 +0100 (CET) Received: (qmail 75489 invoked by uid 500); 8 Nov 2018 17:01:26 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 75480 invoked by uid 99); 8 Nov 2018 17:01:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2018 17:01:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 400AFE0041; Thu, 8 Nov 2018 17:01:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexey@apache.org To: commits@kudu.apache.org Message-Id: <9ebabf713ea84164b446349eeb0b984d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kudu git commit: [cmake] no empty KUDU_DATA_FILES ctest env variables Date: Thu, 8 Nov 2018 17:01:26 +0000 (UTC) Repository: kudu Updated Branches: refs/heads/master c5665046c -> 3906d94a4 [cmake] no empty KUDU_DATA_FILES ctest env variables This patch introduces an update on ADD_KUDU_TEST() custom function: if DATA_FILES is not specified for a test, don't add KUDU_DATA_FILES variable into its ctest environment. Prior to this patch, ctest environment of every test binary would contain KUDU_DATA_FILES variable. If DATA_FILES was specified for a test, it was set to corresponding value, otherwise it was set to an empty string. Change-Id: I2b255f6148649cd282bab70fb19c3321fec01adb Reviewed-on: http://gerrit.cloudera.org:8080/11907 Tested-by: Kudu Jenkins Reviewed-by: Adar Dembo Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/3906d94a Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/3906d94a Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/3906d94a Branch: refs/heads/master Commit: 3906d94a462b9a5b6af50010c48f5a23de54477c Parents: c566504 Author: Alexey Serbin Authored: Wed Nov 7 15:52:07 2018 -0800 Committer: Alexey Serbin Committed: Thu Nov 8 16:52:12 2018 +0000 ---------------------------------------------------------------------- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/3906d94a/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b34867..ce6d943 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -874,8 +874,10 @@ function(ADD_KUDU_TEST REL_TEST_NAME) # The only way we can pass information to dist-test is through the environment. # So, use a comma-delimited environment variable to pass the list of data files # that need to be uploaded. - string(REPLACE ";" "," DATA_FILES_ENV "${DATA_FILES_LIST}") - list(APPEND CUR_TEST_ENV "KUDU_DATA_FILES=${DATA_FILES_ENV}") + if(DATA_FILES_LIST) + string(REPLACE ";" "," DATA_FILES_ENV "${DATA_FILES_LIST}") + list(APPEND CUR_TEST_ENV "KUDU_DATA_FILES=${DATA_FILES_ENV}") + endif() set_tests_properties(${TARGET} PROPERTIES TIMEOUT ${EXTENDED_TIMEOUT}