2007-06-25 19:24:21 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2007 Carlos Rica
|
|
|
|
|
#
|
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='git stripspace'
|
2007-06-25 19:24:21 +00:00
|
|
|
|
tests: add a test mode for SANITIZE=leak, run it in CI
While git can be compiled with SANITIZE=leak, we have not run
regression tests under that mode. Memory leaks have only been fixed as
one-offs without structured regression testing.
This change adds CI testing for it. We'll now build and small set of
whitelisted t00*.sh tests under Linux with a new job called
"linux-leaks".
The CI target uses a new GIT_TEST_PASSING_SANITIZE_LEAK=true test
mode. When running in that mode, we'll assert that we were compiled
with SANITIZE=leak. We'll then skip all tests, except those that we've
opted-in by setting "TEST_PASSES_SANITIZE_LEAK=true".
A test setting "TEST_PASSES_SANITIZE_LEAK=true" setting can in turn
make use of the "SANITIZE_LEAK" prerequisite, should they wish to
selectively skip tests even under
"GIT_TEST_PASSING_SANITIZE_LEAK=true". In the preceding commit we
started doing this in "t0004-unwritable.sh" under SANITIZE=leak, now
it'll combine nicely with "GIT_TEST_PASSING_SANITIZE_LEAK=true".
This is how tests that don't set "TEST_PASSES_SANITIZE_LEAK=true" will
be skipped under GIT_TEST_PASSING_SANITIZE_LEAK=true:
$ GIT_TEST_PASSING_SANITIZE_LEAK=true ./t0001-init.sh
1..0 # SKIP skip all tests in t0001 under SANITIZE=leak, TEST_PASSES_SANITIZE_LEAK not set
The intent is to add more TEST_PASSES_SANITIZE_LEAK=true annotations
as follow-up change, but let's start small to begin with.
In ci/run-build-and-tests.sh we make use of the default "*" case to
run "make test" without any GIT_TEST_* modes. SANITIZE=leak is known
to fail in combination with GIT_TEST_SPLIT_INDEX=true in
t0016-oidmap.sh, and we're likely to have other such failures in
various GIT_TEST_* modes. Let's focus on getting the base tests
passing, we can expand coverage to GIT_TEST_* modes later.
It would also be possible to implement a more lightweight version of
this by only relying on setting "LSAN_OPTIONS". See
<YS9OT/pn5rRK9cGB@coredump.intra.peff.net>[1] and
<YS9ZIDpANfsh7N+S@coredump.intra.peff.net>[2] for a discussion of
that. I've opted for this approach of adding a GIT_TEST_* mode instead
because it's consistent with how we handle other special test modes.
Being able to add a "!SANITIZE_LEAK" prerequisite and calling
"test_done" early if it isn't satisfied also means that we can more
incrementally add regression tests without being forced to fix
widespread and hard-to-fix leaks at the same time.
We have tests that do simple checking of some tool we're interested
in, but later on in the script might be stressing trace2, or common
sources of leaks like "git log" in combination with the tool (e.g. the
commit-graph tests). To be clear having a prerequisite could also be
accomplished by using "LSAN_OPTIONS" directly.
On the topic of "LSAN_OPTIONS": It would be nice to have a mode to
aggregate all failures in our various scripts, see [2] for a start at
doing that which sets "log_path" in "LSAN_OPTIONS". I've punted on
that for now, it can be added later.
As of writing this we've got major regressions between master..seen,
i.e. the t000*.sh tests and more fixed since 31f9acf9ce2 (Merge branch
'ah/plugleaks', 2021-08-04) have regressed recently.
See the discussion at <87czsv2idy.fsf@evledraar.gmail.com>[3] about
the lack of this sort of test mode, and 0e5bba53af (add UNLEAK
annotation for reducing leak false positives, 2017-09-08) for the
initial addition of SANITIZE=leak.
See also 09595ab381 (Merge branch 'jk/leak-checkers', 2017-09-19),
7782066f67 (Merge branch 'jk/apache-lsan', 2019-05-19) and the recent
936e58851a (Merge branch 'ah/plugleaks', 2021-05-07) for some of the
past history of "one-off" SANITIZE=leak (and more) fixes.
As noted in [5] we can't support this on OSX yet until Clang 14 is
released, at that point we'll probably want to resurrect that
"osx-leaks" job.
1. https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer
2. https://lore.kernel.org/git/YS9OT%2Fpn5rRK9cGB@coredump.intra.peff.net/
3. https://lore.kernel.org/git/87czsv2idy.fsf@evledraar.gmail.com/
4. https://lore.kernel.org/git/YS9ZIDpANfsh7N+S@coredump.intra.peff.net/
5. https://lore.kernel.org/git/20210916035603.76369-1-carenas@gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-09-23 09:20:46 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2007-06-25 19:24:21 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
t40='A quick brown fox jumps over the lazy do'
|
|
|
|
|
s40=' '
|
|
|
|
|
sss="$s40$s40$s40$s40$s40$s40$s40$s40$s40$s40" # 400
|
|
|
|
|
ttt="$t40$t40$t40$t40$t40$t40$t40$t40$t40$t40" # 400
|
|
|
|
|
|
2022-03-12 06:21:26 +00:00
|
|
|
printf_git_stripspace () {
|
|
|
|
|
printf "$1" | git stripspace
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-25 19:24:21 +00:00
|
|
|
test_expect_success \
|
|
|
|
|
'long lines without spaces should be unchanged' '
|
|
|
|
|
echo "$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'lines with spaces at the beginning should be unchanged' '
|
|
|
|
|
echo "$sss$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$sss$sss$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$sss$sss$sss$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'lines with intermediate spaces should be unchanged' '
|
|
|
|
|
echo "$ttt$sss$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$sss$sss$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git stripspace <expect >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'consecutive blank lines should be unified' '
|
|
|
|
|
printf "$ttt\n\n$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n\n$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt\n\t\n \n\n \t\t\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n\n$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt$ttt\n\t\n \n\n \t\t\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt$ttt$ttt\n\t\n \n\n \t\t\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt\n\t\n \n\n \t\t\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt\n\t\n \n\n \t\t\n$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
|
|
|
|
|
printf "$ttt\n\t\n \n\n \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-10 21:53:45 +00:00
|
|
|
'only consecutive blank lines should be completely removed' '
|
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
2007-07-10 21:53:45 +00:00
|
|
|
'
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-10 21:53:45 +00:00
|
|
|
test_expect_success \
|
|
|
|
|
'consecutive blank lines at the beginning should be removed' '
|
2007-06-25 19:24:21 +00:00
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-10 21:53:45 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'consecutive blank lines at the end should be removed' '
|
|
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt$ttt\n" > expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" > expect &&
|
2007-07-10 21:53:45 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'text without newline at end should end with newline' '
|
2022-03-12 06:21:26 +00:00
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# text plus spaces at the end:
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'text plus spaces without newline at end should end with newline' '
|
2022-03-12 06:21:26 +00:00
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
|
|
|
|
|
test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-06-25 19:24:21 +00:00
|
|
|
'text plus spaces without newline at end should not show spaces' '
|
2022-03-12 06:21:26 +00:00
|
|
|
printf "$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$ttt$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$ttt$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'text plus spaces without newline should show the correct lines' '
|
|
|
|
|
printf "$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$sss$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt$ttt\n" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-06-25 19:24:21 +00:00
|
|
|
'text plus spaces at end should not show spaces' '
|
2022-03-12 06:21:26 +00:00
|
|
|
echo "$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
echo "$ttt$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
echo "$ttt$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'text plus spaces at end should be cleaned and newline must remain' '
|
|
|
|
|
echo "$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$sss$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
|
|
|
|
echo "$ttt$ttt$ttt" >expect &&
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# spaces only:
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'spaces with newline at end should be replaced with empty string' '
|
2007-07-03 05:52:14 +00:00
|
|
|
echo | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$sss$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
echo "$sss$sss$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-06-25 19:24:21 +00:00
|
|
|
'spaces without newline at end should not show spaces' '
|
2022-03-12 06:21:26 +00:00
|
|
|
printf "" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$sss$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null &&
|
|
|
|
|
printf "$sss$sss$sss$sss" | git stripspace >tmp &&
|
|
|
|
|
! grep " " tmp >/dev/null
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'spaces without newline at end should be replaced with empty string' '
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual &&
|
2007-06-25 19:24:21 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
printf "$sss$sss$sss$sss" | git stripspace >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2007-06-25 19:24:21 +00:00
|
|
|
'
|
|
|
|
|
|
2007-07-10 21:59:43 +00:00
|
|
|
test_expect_success \
|
|
|
|
|
'consecutive text lines should be unchanged' '
|
|
|
|
|
printf "$ttt$ttt\n$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 21:59:43 +00:00
|
|
|
|
|
|
|
|
printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
|
|
|
|
|
printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 21:59:43 +00:00
|
|
|
'
|
|
|
|
|
|
2007-07-23 11:58:27 +00:00
|
|
|
test_expect_success 'strip comments, too' '
|
|
|
|
|
test ! -z "$(echo "# comment" | git stripspace)" &&
|
|
|
|
|
test -z "$(echo "# comment" | git stripspace -s)"
|
|
|
|
|
'
|
|
|
|
|
|
2013-01-16 19:18:48 +00:00
|
|
|
test_expect_success 'strip comments with changed comment char' '
|
|
|
|
|
test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" &&
|
|
|
|
|
test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-c with single line' '
|
|
|
|
|
printf "# foo\n" >expect &&
|
|
|
|
|
printf "foo" | git stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-c with single line followed by empty line' '
|
|
|
|
|
printf "# foo\n#\n" >expect &&
|
|
|
|
|
printf "foo\n\n" | git stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-c with newline only' '
|
|
|
|
|
printf "#\n" >expect &&
|
|
|
|
|
printf "\n" | git stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--comment-lines with single line' '
|
|
|
|
|
printf "# foo\n" >expect &&
|
|
|
|
|
printf "foo" | git stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-c with changed comment char' '
|
|
|
|
|
printf "; foo\n" >expect &&
|
|
|
|
|
printf "foo" | git -c core.commentchar=";" stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2016-11-21 14:18:24 +00:00
|
|
|
test_expect_success '-c with comment char defined in .git/config' '
|
2016-11-21 14:18:05 +00:00
|
|
|
test_config core.commentchar = &&
|
|
|
|
|
printf "= foo\n" >expect &&
|
2018-12-17 16:59:57 +00:00
|
|
|
rm -fr sub &&
|
|
|
|
|
mkdir sub &&
|
|
|
|
|
printf "foo" | git -C sub stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-c outside git repository' '
|
|
|
|
|
printf "# foo\n" >expect &&
|
|
|
|
|
printf "foo" | nongit git stripspace -c >actual &&
|
2016-11-21 14:18:05 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2014-10-27 21:13:15 +00:00
|
|
|
test_expect_success 'avoid SP-HT sequence in commented line' '
|
|
|
|
|
printf "#\tone\n#\n# two\n" >expect &&
|
|
|
|
|
printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-25 19:24:21 +00:00
|
|
|
test_done
|