woodsnick
commented
7 years ago Looks like the lines with -d are just there to create a directory and don't need the -C anyway? Likely diff would be something like this. Missing anything?
diff --git a/Makefile b/Makefile index 764bd65..1f4574d 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,11 @@ test:
Install support:
install:
- install -C -d -m 0755 $(INSTALL_LIB)/
- install -d -m 0755 $(INSTALL_LIB)/ install -C -m 0755 $(LIB) $(INSTALL_LIB)/
- install -C -d -m 0755 $(INSTALL_EXT)/
- install -d -m 0755 $(INSTALL_EXT)/ install -C -m 0755 $(EXTS) $(INSTALL_EXT)/
- install -C -d -m 0755 $(INSTALL_MAN1)/
- install -d -m 0755 $(INSTALL_MAN1)/ install -C -m 0644 $(MAN1)/$(NAME).1 $(INSTALL_MAN1)/
Running "sudo make install" after a clone I see errors / warnings related to the -d and -C options not being allowed to be used together. I "think" things installed correctly though make test also fails.
First the "sudo make install" output (I do see sit-subrepo install in at least some of those locations)
install -C -d -m 0755 /usr/local/Cellar/git/2.11.0/libexec/git-core/ install: the -d and -C options may not be specified together install -C -m 0755 lib/git-subrepo /usr/local/Cellar/git/2.11.0/libexec/git-core/ install -C -d -m 0755 /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo.d/ install: the -d and -C options may not be specified together install -C -m 0755 lib/git-subrepo.d/help-functions.bash lib/git-subrepo.d/bash+.bash /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo.d/ install -C -d -m 0755 /usr/local/share/man/man1/ install: the -d and -C options may not be specified together install -C -m 0644 man/man1/git-subrepo.1 /usr/local/share/man/man1/
Now the make test failures:
make test prove test/ test/branch-all.t ........... /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/branch-all.t ........... No subtests run test/branch.t ............... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/branch.t ............... No subtests run test/clean.t ................ Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/clean.t ................ No subtests run test/clone-annotated-tag.t .. /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/clone-annotated-tag.t .. No subtests run test/clone.t ................ 1/? /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory
Tests were run but no plan was declared.
test/clone.t ................ All 6 subtests passed test/compile.t .............. ok
test/encode.t ............... /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/encode.t ............... No subtests run test/error.t ................ /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/setup: line 58: foo/file: No such file or directory fatal: pathspec 'foo/file' did not match any files /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/error.t ................ 1/? # Failed test 'Error OK: can't create a branch that exists'
at test/error.t line 21.
--- /tmp/want-49262 2017-08-02 20:42:29.000000000 -0700 +++ /tmp/got-49262 2017-08-02 20:42:29.000000000 -0700 @@ -1 +1 @@ -git-subrepo: Branch 'subrepo/foo' already exists. Use '--force' to override. +/usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory
Tests were run but no plan was declared.
test/error.t ................ Failed 1/1 subtests test/init.t ................. 1/? /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory
Tests were run but no plan was declared.
test/init.t ................. All 5 subtests passed test/issue29.t .............. /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/issue29.t .............. No subtests run test/issue95.t .............. /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/issue95.t .............. No subtests run test/issue96.t .............. /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/issue96.t .............. No subtests run test/merge-base-all.t ....... 1/? # Failed test 'merge-base (without --all) produces 3 lines'
at test/merge-base-all.t line 12.
got: '0'
expected: '3'
Failed test 'merge-base --all produces more lines'
at test/merge-base-all.t line 17.
got: '0'
expected: '5'
test/merge-base-all.t ....... Failed 2/2 subtests test/merge-base-revert.t .... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/merge-base-revert.t .... No subtests run test/merge-base.t ........... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/merge-base.t ........... No subtests run test/pull-all.t ............. Died at line 15 in main of test/pull-all.t test/pull-all.t ............. No subtests run test/pull-merge.t ........... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-merge.t ........... No subtests run test/pull-new-branch.t ...... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-new-branch.t ...... No subtests run test/pull-ours.t ............ Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-ours.t ............ No subtests run test/pull-revert.t .......... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-revert.t .......... No subtests run test/pull-theirs.t .......... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-theirs.t .......... No subtests run test/pull-twice.t ........... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull-twice.t ........... No subtests run test/pull.t ................. Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/pull.t ................. No subtests run test/push-after-init.t ...... No subtests run test/push-force.t ........... Died at line 52 in subrepo-clone-bar-into-foo of test/setup test/push-force.t ........... No subtests run test/push-new-branch.t ...... Died at line 21 in main of test/push-new-branch.t test/push-new-branch.t ...... No subtests run test/push-no-changes.t ...... /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/push-no-changes.t ...... 1/? # Failed test 'Output OK: Check that 'push' requires changes to push'
at test/push-no-changes.t line 18.
--- /tmp/want-51107 2017-08-02 20:42:32.000000000 -0700 +++ /tmp/got-51107 2017-08-02 20:42:32.000000000 -0700 @@ -1 +1 @@ -Subrepo 'foo' has no new commits to push. +/usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory
Tests were run but no plan was declared.
test/push-no-changes.t ...... Failed 1/1 subtests test/push.t ................. cat: bar/.gitrepo: No such file or directory test/push.t ................. No subtests run test/reclone.t .............. /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/reclone.t .............. No subtests run test/status.t ............... /usr/local/Cellar/git/2.11.0/libexec/git-core/git-subrepo: line 25: /usr/local/Cellar/git/2.11.0/libexec/git-core/../ext/bashplus/lib/bash+.bash: No such file or directory test/status.t ............... No subtests run test/submodule.t ............ Died at line 27 in main of test/submodule.t test/submodule.t ............ No subtests run
Test Summary Report
test/branch-all.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/branch.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/clean.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/clone-annotated-tag.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/clone.t (Wstat: 0 Tests: 6 Failed: 0) Parse errors: No plan found in TAP output test/encode.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/error.t (Wstat: 0 Tests: 1 Failed: 1) Failed test: 1 Parse errors: No plan found in TAP output test/init.t (Wstat: 0 Tests: 5 Failed: 0) Parse errors: No plan found in TAP output test/issue29.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/issue95.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/issue96.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/merge-base-all.t (Wstat: 0 Tests: 2 Failed: 2) Failed tests: 1-2 test/merge-base-revert.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/merge-base.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-all.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-merge.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-new-branch.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-ours.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-revert.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-theirs.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull-twice.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/pull.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push-after-init.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push-force.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push-new-branch.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push-no-changes.t (Wstat: 0 Tests: 1 Failed: 1) Failed test: 1 Parse errors: No plan found in TAP output test/push.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/reclone.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/status.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/submodule.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output Files=31, Tests=17, 6 wallclock secs ( 0.08 usr 0.06 sys + 2.10 cusr 2.81 csys = 5.05 CPU) Result: FAIL make: *** [test] Error 1