From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 48B471F42D for ; Sat, 24 Mar 2018 07:45:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbeCXHpl (ORCPT ); Sat, 24 Mar 2018 03:45:41 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:43456 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719AbeCXHpj (ORCPT ); Sat, 24 Mar 2018 03:45:39 -0400 Received: by mail-lf0-f68.google.com with SMTP id v207-v6so21403170lfa.10 for ; Sat, 24 Mar 2018 00:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3nye6n+23GuEC80Zp32kBv3cJhiuHRSDmVvGxyJDKlc=; b=JX3ecoEWkGBTeFvJVXgVXKRfWXrq638IMZI3siqne7XvSZzUPARoHX4yuoON9pdvmo Ra5nqUQqfr5BnkMJfeFWNmU0AmKMsn5x1lyaDo7nThPfa7veUyhCz4EtiPpsaOPlLzf9 r2XNGgUvWIs5VL/HvJhVbFzRHLjV/HC174XZ5L5YWngJLh8jRp6FSt5Ruk4TvYtixtCH 66ca+rV7NAE7JOmsDXxu7tS0nWBpYdhKNfmLydtLPfk79CDk8IDqG2buQ8sbsUPUhEtx uAcpINjKnMQjbGae/uuT1GxvjZ15emPwq7ysgMo8ihXy64mtm8EbHbW/yu9FQxPmv/iv fIjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3nye6n+23GuEC80Zp32kBv3cJhiuHRSDmVvGxyJDKlc=; b=m9S9dM9vSUBClvOdpSapvUJmuCoCRBDPZU7EeOJiuuEg5BwOTMW3S5eT/WLHwXXxVs SwmtIoMHN+2wC207dLFWjLb3X8jyXMzRrMiAnkuQEw4odOqR9XqZR9VhHVruPAe39xv/ YK+2dx0eDwSm35PPXtYLno/Xxd15RqTrcu9Iyb5QNxe5eMnrYxIgzaGR0iT3ssJbsy9y GbRKUpqTKRpERLeIXUsjPPCM99H2Gc+Dx0qGMOADN2m/OsPBabB2WphrcFyQ5jkDS8M4 MbyteAAbLhM1sYcxk9GyKAe3FwRZeK0G8BeD2Tjxb8uZitKr7t+0fBa0FOhx0rDlGggx 9i7Q== X-Gm-Message-State: AElRT7E/xgiI2sngKVXHHfNLFAg0n1B1YVexiuGhRjlgppZbf2GGSl21 l55ix/xqZUJ361k0Zvo3925wzw== X-Google-Smtp-Source: AG47ELulTC7KiPhtaDbFQZq+5CBxHJRusnjrHDDgEDKs1UK1fFU7OIM06EiaDHmhLDtvdkNRVG53WA== X-Received: by 10.46.85.196 with SMTP id g65mr5804243lje.10.1521877538494; Sat, 24 Mar 2018 00:45:38 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id g7sm2313741ljj.50.2018.03.24.00.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 00:45:37 -0700 (PDT) From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: pclouds@gmail.com Cc: git@vger.kernel.org, Eric Sunshine , Jeff Hostetler , Junio C Hamano Subject: [PATCH v2 06/36] t/helper: merge test-ctype into test-tool Date: Sat, 24 Mar 2018 08:44:35 +0100 Message-Id: <20180324074505.19100-7-pclouds@gmail.com> X-Mailer: git-send-email 2.17.0.rc0.348.gd5a49e0b6f In-Reply-To: <20180324074505.19100-1-pclouds@gmail.com> References: <20180317075421.22032-1-pclouds@gmail.com> <20180324074505.19100-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Nguyễn Thái Ngọc Duy --- Makefile | 2 +- t/helper/test-ctype.c | 3 ++- t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/t0070-fundamental.sh | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 227f16ad17..d09710dc3d 100644 --- a/Makefile +++ b/Makefile @@ -654,10 +654,10 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) TEST_BUILTINS_OBJS += test-chmtime.o TEST_BUILTINS_OBJS += test-config.o +TEST_BUILTINS_OBJS += test-ctype.o TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o TEST_BUILTINS_OBJS += test-sha1.o -TEST_PROGRAMS_NEED_X += test-ctype TEST_PROGRAMS_NEED_X += test-date TEST_PROGRAMS_NEED_X += test-delta TEST_PROGRAMS_NEED_X += test-drop-caches diff --git a/t/helper/test-ctype.c b/t/helper/test-ctype.c index bb72c47df5..92c4c2313e 100644 --- a/t/helper/test-ctype.c +++ b/t/helper/test-ctype.c @@ -1,3 +1,4 @@ +#include "test-tool.h" #include "cache.h" static int rc; @@ -28,7 +29,7 @@ static int is_in(const char *s, int ch) #define LOWER "abcdefghijklmnopqrstuvwxyz" #define UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -int cmd_main(int argc, const char **argv) +int cmd__ctype(int argc, const char **argv) { TEST_CLASS(isdigit, DIGIT); TEST_CLASS(isspace, " \n\r\t"); diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index e8d6c6b9eb..d600a31935 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -9,6 +9,7 @@ struct test_cmd { static struct test_cmd cmds[] = { { "chmtime", cmd__chmtime }, { "config", cmd__config }, + { "ctype", cmd__ctype }, { "lazy-init-name-hash", cmd__lazy_init_name_hash }, { "sha1", cmd__sha1 }, }; diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index 3084f458a0..41805ecd1c 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -3,6 +3,7 @@ int cmd__chmtime(int argc, const char **argv); int cmd__config(int argc, const char **argv); +int cmd__ctype(int argc, const char **argv); int cmd__lazy_init_name_hash(int argc, const char **argv); int cmd__sha1(int argc, const char **argv); diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 991ed2a48d..70d4d98a2e 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -9,7 +9,7 @@ Verify wrappers and compatibility functions. . ./test-lib.sh test_expect_success 'character classes (isspace, isalpha etc.)' ' - test-ctype + test-tool ctype ' test_expect_success 'mktemp to nonexistent directory prints filename' ' -- 2.17.0.rc0.348.gd5a49e0b6f