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=-3.2 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham 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 21F4920964 for ; Tue, 4 Apr 2017 21:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177AbdDDVJD (ORCPT ); Tue, 4 Apr 2017 17:09:03 -0400 Received: from siwi.pair.com ([209.68.5.199]:24699 "EHLO siwi.pair.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753722AbdDDVJC (ORCPT ); Tue, 4 Apr 2017 17:09:02 -0400 Received: from jeffhost-ubuntu.reddog.microsoft.com (unknown [65.55.188.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by siwi.pair.com (Postfix) with ESMTPSA id 78B0D8461A; Tue, 4 Apr 2017 17:09:01 -0400 (EDT) From: git@jeffhostetler.com To: git@vger.kernel.org Cc: gitster@pobox.com, peff@peff.net, Jeff Hostetler Subject: [PATCH v4 3/4] test-strcmp-offset: created test for strcmp_offset Date: Tue, 4 Apr 2017 21:08:46 +0000 Message-Id: <20170404210847.50860-4-git@jeffhostetler.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170404210847.50860-1-git@jeffhostetler.com> References: <20170404210847.50860-1-git@jeffhostetler.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- Makefile | 1 + t/helper/.gitignore | 1 + t/helper/test-strcmp-offset.c | 64 +++++++++++++++++++++++++++++++++++++++++++ t/t0065-strcmp-offset.sh | 11 ++++++++ 4 files changed, 77 insertions(+) create mode 100644 t/helper/test-strcmp-offset.c create mode 100755 t/t0065-strcmp-offset.sh diff --git a/Makefile b/Makefile index 9ec6065..4c4c246 100644 --- a/Makefile +++ b/Makefile @@ -631,6 +631,7 @@ TEST_PROGRAMS_NEED_X += test-scrap-cache-tree TEST_PROGRAMS_NEED_X += test-sha1 TEST_PROGRAMS_NEED_X += test-sha1-array TEST_PROGRAMS_NEED_X += test-sigchain +TEST_PROGRAMS_NEED_X += test-strcmp-offset TEST_PROGRAMS_NEED_X += test-string-list TEST_PROGRAMS_NEED_X += test-submodule-config TEST_PROGRAMS_NEED_X += test-subprocess diff --git a/t/helper/.gitignore b/t/helper/.gitignore index d6e8b36..0a89531 100644 --- a/t/helper/.gitignore +++ b/t/helper/.gitignore @@ -25,6 +25,7 @@ /test-sha1 /test-sha1-array /test-sigchain +/test-strcmp-offset /test-string-list /test-submodule-config /test-subprocess diff --git a/t/helper/test-strcmp-offset.c b/t/helper/test-strcmp-offset.c new file mode 100644 index 0000000..fe01318 --- /dev/null +++ b/t/helper/test-strcmp-offset.c @@ -0,0 +1,64 @@ +#include "cache.h" + +struct test_data { + const char *s1; + const char *s2; + int first_change; +}; + +static struct test_data data[] = { + { "abc", "abc", 0 }, + { "abc", "def", 0 }, + + { "abc", "abz", 2 }, + + { "abc", "abcdef", 3 }, + + { "abc\xF0zzz", "abc\xFFzzz", 3 }, + + { NULL, NULL, 0 } +}; + +int try_pair(const char *sa, const char *sb, int first_change) +{ + int failed = 0; + int offset, r_exp, r_tst; + int r_exp_sign, r_tst_sign; + + /* + * Because differnt CRTs behave differently, only rely on signs + * of the result values. + */ + r_exp = strcmp(sa, sb); + r_exp_sign = ((r_exp < 0) ? -1 : ((r_exp == 0) ? 0 : 1)); + + r_tst = strcmp_offset(sa, sb, &offset); + r_tst_sign = ((r_tst < 0) ? -1 : ((r_tst == 0) ? 0 : 1)); + + if (r_tst_sign != r_exp_sign) { + error("FAIL: '%s' vs '%s', result expect %d, observed %d\n", + sa, sb, r_exp_sign, r_tst_sign); + failed = 1; + } + + if (offset != first_change) { + error("FAIL: '%s' vs '%s', offset expect %d, observed %d\n", + sa, sb, first_change, offset); + failed = 1; + } + + return failed; +} + +int cmd_main(int argc, const char **argv) +{ + int failed = 0; + int k; + + for (k=0; data[k].s1; k++) { + failed += try_pair(data[k].s1, data[k].s2, data[k].first_change); + failed += try_pair(data[k].s2, data[k].s1, data[k].first_change); + } + + return failed; +} diff --git a/t/t0065-strcmp-offset.sh b/t/t0065-strcmp-offset.sh new file mode 100755 index 0000000..0176c8c --- /dev/null +++ b/t/t0065-strcmp-offset.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +test_description='Test strcmp_offset functionality' + +. ./test-lib.sh + +test_expect_success run_helper ' + test-strcmp-offset +' + +test_done -- 2.9.3