Re: [PATCH 00/14] Add submodule test harness
- From
Jens Lehmann <jens.lehmann@web.de>
- Date
- Jul 2, 2014, 19:57 UTC
- Message-ID
- <53B46425.3030000@web.de>
- In-Reply-To
- <53B41D42.2090805@web.de>
Am 02.07.2014 16:54, schrieb Torsten Bögershausen:
> (Not sure if this is the right thread) > (I haven't checked if this is fixed in your latest version)
Yes, this is the right thread and no, it isn't fixed yet.
Show 10 quoted lines
> On what I have on pu 7a0da7902cbbc9a876b90c9, Tue Jul 1 14:51:53 2014 -0700 > > Many submodule tests are broken. > One problem is here: > > lib-submodule-update.sh:264: possible problem: echo -n is not portable (please use printf): echo -n >sub1 && > lib-submodule-update.sh:507: possible problem: echo -n is not portable (please use printf): echo -n >sub1 && > > You can remove the "empty" "echo -n" to create an empty file: >> sub1 &&
Thanks for spotting and diagnosing this. Running "make lint" in the test directory only feeds the tests to check-non-portable-shell.pl, but not the *lib*.sh helper scripts, which made me miss this one.
The following diff should fix it for you. Am I understanding you correctly that you are experiencing other failures too? I see no other incompatibilities when running ./check-non-portable-shell.pl on all the shell scripts in the repo.
-----8<----
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index 24c9fd7..3584755 100755 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@ -304,7 +304,7 @@ test_submodule_switch () { ( cd submodule_update && git branch -t add_sub1 origin/add_sub1 && - echo -n >sub1 && + >sub1 && test_must_fail $command add_sub1 && test_superproject_content origin/no_submodule && test_must_be_empty sub1 @@ -547,7 +547,7 @@ test_submodule_forced_switch () { ( cd submodule_update && git branch -t add_sub1 origin/add_sub1 && - echo -n >sub1 && + >sub1 && $command add_sub1 && test_superproject_content origin/add_sub1 && test_dir_is_empty sub1
-- 2.0.1.458.gf680257.dirty