From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 474101F9E0 for ; Fri, 24 Apr 2020 17:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728894AbgDXR2f (ORCPT ); Fri, 24 Apr 2020 13:28:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727863AbgDXR2e (ORCPT ); Fri, 24 Apr 2020 13:28:34 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1FE5C09B048 for ; Fri, 24 Apr 2020 10:28:26 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id z6so3968062plk.10 for ; Fri, 24 Apr 2020 10:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=wz2CSzg/6dHptUSXRZMAnpIYOJDigspSoBvCMV7VEeU=; b=E8mtHFljPNlGk61k8txykXi62PeOO5mZJKFW1rD/gVU0Tl+OBYGvn9SitNV1uiAE6A ux/zFybQvEn9fUNQPy7/U9mVXu5UWIFcx4Ga6GjCaJHUjrro1D0PRrt1eehK7YSmuHon aSp4eAhc3drAsNGTTwl0ubi1XVv6IRhu8Sk5Fq2Be7wvukynTv1M9TyJDxsv21gkfyo2 UJ7U2Wk4zNkrOxSI3Wz2Dq+dkrAh/cm/WDrzELy8UIowiK9fzcOKLHOLy6TuavSSzZhA TmBEvxute1e0jUMjiUTPH1QW49x9QqPUAAxokWCP6vDDcu4ZiFE6xw573eVegCNlbx5I z3Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wz2CSzg/6dHptUSXRZMAnpIYOJDigspSoBvCMV7VEeU=; b=rY5c0GiDN0v4vneMNUzzcENo0cmYpgdQQxOTCsVbwmwK3KJp0bfXUHJJOVejJh8b4n XgMybhJT01CqQPnrW8ipoB34CN7AbCYG2KB0CVP8nUh9wa6W6GoYBo04TXJKqaIoi/Jf X34X5Rg8vnkcgqU8l138qRrshv51OmAFGAV2c5B5FT5kWzFJRNU5n3MBquHkY/4kGPdK Ud+sVITwgxO6K4Uj+xZ9V2xVempS53KingxQsOJmo1Muut+8IanZUy+WD3s63jOHSa3j ObavKZ9muGRRvWZXGNSWi6G+eR+0OVApkbtqi+DU55ocFwagwcaq5DuvUZSrxbNw4ewa b1jQ== X-Gm-Message-State: AGi0PuZija1Yvu7bE/5HhsWWxNOVcTstOmvazPdqMpdFch8AE0DPrdHf 6ReAvHoS39yFOJbMkVsFF9DdmRKXhHI= X-Google-Smtp-Source: APiQypL0haIVrw9q4R+q2rLTKLwNDCDBCAJhbQoeck8B1QaHj5xdU0NCtUW2zVE2xGOj/Kl+BaXbQA== X-Received: by 2002:a17:90a:4d4e:: with SMTP id l14mr7500670pjh.136.1587749306376; Fri, 24 Apr 2020 10:28:26 -0700 (PDT) Received: from localhost ([2402:800:6374:f359:1ce8:a621:5f80:1116]) by smtp.gmail.com with ESMTPSA id u5sm4589655pfu.198.2020.04.24.10.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 10:28:24 -0700 (PDT) Date: Sat, 25 Apr 2020 00:28:23 +0700 From: Danh Doan To: Sibi Siddharthan via GitGitGadget Cc: git@vger.kernel.org, Sibi Siddharthan Subject: Re: [PATCH 4/8] cmake: support for testing git with ctest Message-ID: <20200424172823.GK1949@danh.dev> References: <35a3554df3e4be98f20837ecb08bf6a7a890aadb.1587700897.git.gitgitgadget@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <35a3554df3e4be98f20837ecb08bf6a7a890aadb.1587700897.git.gitgitgadget@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 2020-04-24 04:01:33+0000, Sibi Siddharthan via GitGitGadget wrote: > From: Sibi Siddharthan > > This patch provides an alternate way to test git using ctest. > CTest ships with CMake, so there is no additional dependency being > introduced. > > To perform the tests with ctest do this after building: > ctest -j[number of jobs] > > NOTE: -j is optional, the default number of jobs is 1 > > Each of the jobs does this: > cd t/ && sh t[something].sh > > The reason for using CTest is that it logs the output of the tests > in a neat way, which can be helpful during diagnosis of failures. > > After the tests have run ctest generates three log files located in > `build-directory`/Testing/Temporary/ > > These log files are: > > CTestCostData.txt: > This file contains the time taken to complete each test. > > LastTestsFailed.log: > This log file contains the names of the tests that have failed in the > run. > > LastTest.log: > This log file contains the log of all the tests that have run. > A snippet of the file is given below. > > 10/901 Testing: D:/my/git-master/t/t0009-prio-queue.sh > 10/901 Test: D:/my/git-master/t/t0009-prio-queue.sh > Command: "sh.exe" "D:/my/git-master/t/t0009-prio-queue.sh" > Directory: D:/my/git-master/t > "D:/my/git-master/t/t0009-prio-queue.sh" > Output: > ---------------------------------------------------------- > ok 1 - basic ordering > ok 2 - mixed put and get > ok 3 - notice empty queue > ok 4 - stack order > passed all 4 test(s) > 1..4 > > Test time = 1.11 sec > > NOTE: Testing only works when building in source for now. > > Signed-off-by: Sibi Siddharthan > --- > CMakeLists.txt | 142 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 142 insertions(+) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 25de5b5bc35..141ccefa559 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -23,6 +23,7 @@ include(CheckIncludeFile) > include(CheckFunctionExists) > include(CheckSymbolExists) > include(CheckStructHasMember) > +include(CTest) > > find_package(ZLIB REQUIRED) > find_package(CURL) > @@ -680,3 +681,144 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/ > if(MSGFMT_EXE) > install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share) > endif() > + > + > +if(BUILD_TESTING) > + > +#tests-helpers > +add_executable(test-fake-ssh t/helper/test-fake-ssh.c) > +target_link_libraries(test-fake-ssh common-main) > + > +add_executable(test-line-buffer t/helper/test-line-buffer.c) > +target_link_libraries(test-line-buffer common-main vcs-svn) > + > +add_executable(test-svn-fe t/helper/test-svn-fe.c) > +target_link_libraries(test-svn-fe common-main vcs-svn) > + > +set(test_helper_sources > + t/helper/test-tool.c t/helper/test-advise.c t/helper/test-bloom.c t/helper/test-chmtime.c > + t/helper/test-config.c t/helper/test-ctype.c t/helper/test-date.c t/helper/test-delta.c > + t/helper/test-dir-iterator.c t/helper/test-drop-caches.c t/helper/test-dump-cache-tree.c > + t/helper/test-dump-fsmonitor.c t/helper/test-dump-split-index.c > + t/helper/test-dump-untracked-cache.c t/helper/test-example-decorate.c > + t/helper/test-genrandom.c t/helper/test-genzeros.c t/helper/test-hash.c > + t/helper/test-hashmap.c t/helper/test-hash-speed.c t/helper/test-index-version.c > + t/helper/test-json-writer.c t/helper/test-lazy-init-name-hash.c > + t/helper/test-match-trees.c t/helper/test-mergesort.c t/helper/test-mktemp.c > + t/helper/test-oidmap.c t/helper/test-online-cpus.c t/helper/test-parse-options.c > + t/helper/test-parse-pathspec-file.c t/helper/test-path-utils.c t/helper/test-pkt-line.c > + t/helper/test-prio-queue.c t/helper/test-progress.c t/helper/test-reach.c > + t/helper/test-read-cache.c t/helper/test-read-graph.c t/helper/test-read-midx.c > + t/helper/test-ref-store.c t/helper/test-regex.c t/helper/test-repository.c > + t/helper/test-revision-walking.c t/helper/test-run-command.c t/helper/test-scrap-cache-tree.c > + t/helper/test-serve-v2.c t/helper/test-sha1.c t/helper/test-oid-array.c t/helper/test-sha256.c > + t/helper/test-sigchain.c t/helper/test-strcmp-offset.c t/helper/test-string-list.c > + t/helper/test-submodule-config.c t/helper/test-submodule-nested-repo-config.c t/helper/test-subprocess.c > + t/helper/test-trace2.c t/helper/test-urlmatch-normalization.c t/helper/test-xml-encode.c > + t/helper/test-wildmatch.c t/helper/test-windows-named-pipe.c t/helper/test-write-cache.c) > + > +add_executable(test-tool ${test_helper_sources}) > +target_link_libraries(test-tool common-main) > + > +set_target_properties(test-fake-ssh test-line-buffer test-svn-fe test-tool > + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper) > + > +#wrapper scripts > +set(wrapper_scripts > + git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext) > + > +set(wrapper_test_scripts > + test-fake-ssh test-line-buffer test-svn-fe test-tool) > + > + > +foreach(script ${wrapper_scripts}) > + file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) > + string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") > + string(REPLACE "@@PROG@@" "${script}" content "${content}") > + file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) > +endforeach() > + > +foreach(script ${wrapper_test_scripts}) > + file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) > + string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") > + string(REPLACE "@@PROG@@" "t/helper/${script}" content "${content}") > + file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) > +endforeach() > + > +file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) > +string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") > +string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}") > +file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content}) > + > +#options for configuring test options > +option(PERL_TESTS "Perform tests that use perl" ON) > +option(PYTHON_TESTS "Perform tests that use python" ON) > + > +#GIT-BUILD-OPTIONS > +set(TEST_SHELL_PATH ${SHELL_PATH}) > +set(DIFF diff) > +set(PYTHON_PATH /usr/bin/python) > +set(TAR tar) > +set(NO_CURL ) > +set(NO_EXPAT ) > +set(USE_LIBPCRE1 ) > +set(USE_LIBPCRE2 ) Hm, really? > +set(NO_LIBPCRE1_JIT ) > +set(NO_PERL ) > +set(NO_PTHREADS ) > +set(NO_PYTHON ) > +set(PAGER_ENV "LESS=FRX LV=-c") > +set(DC_SHA1 YesPlease) > +set(RUNTIME_PREFIX true) > +set(NO_GETTEXT ) > + > +if(NOT CURL_FOUND) > + set(NO_CURL 1) > +endif() > + > +if(NOT EXPAT_FOUND) > + set(NO_EXPAT 1) > +endif() > + > +if(NOT Intl_FOUND) > + set(NO_GETTEXT 1) > +endif() > + > +if(NOT PERL_TESTS) > + set(NO_PERL 1) > +endif() > + > +if(NOT PYTHON_TESTS) > + set(NO_PYTHON 1) > +endif() I hope we have something like: PYTHON_PATH=/path/to/my/yet/to/release/python/to/check/if/it/works/with/current/git If it's ready, thanks. If it isn't, no, I'm stressed enough by CMake. > + > +file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SHELL_PATH='${SHELL_PATH}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TEST_SHELL_PATH='${TEST_SHELL_PATH}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PERL_PATH='${PERL_PATH}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DIFF='${DIFF}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PYTHON_PATH='${PYTHON_PATH}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TAR='${TAR}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_CURL='${NO_CURL}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_EXPAT='${NO_EXPAT}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "USE_LIBPCRE1='${USE_LIBPCRE1}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_LIBPCRE1_JIT='${NO_LIBPCRE1_JIT}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PERL='${NO_PERL}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X=''\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n") > +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n") > + > +file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh") CMake recommends to not use GLOB for this kind of things, themselves, no? > + > +#test > +foreach(tsh ${test_scipts}) > + add_test(NAME ${tsh} > + COMMAND ${SH_EXE} ${tsh} > + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t) > +endforeach() > + > +endif()#BUILD_TESTING > \ No newline at end of file Please fix your editor! -- Danh