diff options
Diffstat (limited to 'tests/release.testscript')
| -rw-r--r-- | tests/release.testscript | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/release.testscript b/tests/release.testscript index 2ea3b2a..868a577 100644 --- a/tests/release.testscript +++ b/tests/release.testscript @@ -462,7 +462,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $clone_root_repos; rm prj/README.md; - $gp commit -am 'Remove description'; + $gp commit -a -m 'Remove description'; $* 2>>~%EOE% != 0; %error: unable to read .+README\.md referenced by description-file manifest value in .+manifest: .+% @@ -477,7 +477,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' EOE echo '.' >= prj/README.md; - $gp commit -am 'Fill README.md file'; + $gp commit -a -m 'Fill README.md file'; $* } @@ -488,7 +488,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $clone_root_repos; echo 'some-file: README' >+ prj/manifest; - $gp commit -am 'Add file'; + $gp commit -a -m 'Add file'; $* 2>>~%EOE% != 0 %error: invalid package manifest: .+manifest:.+:1: unknown name 'some-file' in package manifest% @@ -511,7 +511,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $* --no-commit; - $gp commit -am 'Release version'; + $gp commit -a -m 'Release version'; $* --tag --push 2>>EOE; pushing branch master, tag v0.1.0 @@ -884,7 +884,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $* --no-commit; - $gp commit -am 'Release revision'; + $gp commit -a -m 'Release revision'; $release --tag --push --yes -d prj; $clone2; @@ -903,10 +903,10 @@ log2 = $gp2 log '--pretty=format:"%d %s"' +$clone_repos +echo '' >+ prj/repositories.manifest - +$gp commit -am 'Fix repositories.manifest' + +$gp commit -a -m 'Fix repositories.manifest' +echo '' >+ prj/buildfile - +$gp commit -am 'Fix buildfile' -m "Add '\n' to the end of the file." + +$gp commit -a -m 'Fix buildfile' -m "Add '\n' to the end of the file." +echo '' >+ prj/manifest +$gp add manifest @@ -975,7 +975,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' { $clone_repos; - $gp commit -am 'Change manifest'; + $gp commit -a -m 'Change manifest'; $*; @@ -1032,7 +1032,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $* --open --no-commit; - $gp commit -am 'Open dev cycle'; + $gp commit -a -m 'Open dev cycle'; $gp push origin HEAD --tags; $clone2; @@ -1058,12 +1058,12 @@ log2 = $gp2 log '--pretty=format:"%d %s"' % \(HEAD -> master, .*\) Create% EOO - $gp commit -am 'Release version'; + $gp commit -a -m 'Release version'; $* --tag; $* --open --no-commit; - $gp commit -am 'Change version'; + $gp commit -a -m 'Change version'; $gp push origin HEAD --tags; $pull2; @@ -1392,22 +1392,22 @@ log2 = $gp2 log '--pretty=format:"%d %s"' : options-incompatibility : { - +$clone_prj - - $* --revision --open 2>'error: both --revision and --open specified' != 0 - $* --revision --alpha 2>'error: both --revision and --alpha specified' != 0 - $* --revision --no-open 2>'error: both --revision and --no-open specified' != 0 - $* --revision --open-beta 2>'error: both --revision and --open-beta specified' != 0 - $* --open --no-tag 2>'error: both --open and --no-tag specified' != 0 - $* --tag --no-commit 2>'error: both --tag and --no-commit specified' != 0 - $* --push --no-commit 2>'error: both --push and --no-commit specified' != 0 - $* --push --show-push 2>'error: both --push and --show-push specified' != 0 - $* --edit --no-commit 2>'error: both --no-commit and --edit specified' != 0 - $* --current-tag=keep 2>'error: --current-tag requires --revision or --tag' != 0 - $* --revision --current-tag keep --no-tag 2>'error: both --current-tag and --no-tag specified' != 0 - $* --open-base 1.2.3 --open-beta 2>'error: both --open-beta and --open-base specified' != 0 - $* --amend 2>'error: --amend requires --revision' != 0 - $* --squash 1 2>'error: --squash requires --amend' != 0 - $* --revision --amend --squash 0 2>'error: invalid --squash value: 0' != 0 + $clone_prj; + + $* --revision --open 2>'error: both --revision and --open specified' != 0; + $* --revision --alpha 2>'error: both --revision and --alpha specified' != 0; + $* --revision --no-open 2>'error: both --revision and --no-open specified' != 0; + $* --revision --open-beta 2>'error: both --revision and --open-beta specified' != 0; + $* --open --no-tag 2>'error: both --open and --no-tag specified' != 0; + $* --tag --no-commit 2>'error: both --tag and --no-commit specified' != 0; + $* --push --no-commit 2>'error: both --push and --no-commit specified' != 0; + $* --push --show-push 2>'error: both --push and --show-push specified' != 0; + $* --edit --no-commit 2>'error: both --no-commit and --edit specified' != 0; + $* --current-tag=keep 2>'error: --current-tag requires --revision or --tag' != 0; + $* --revision --current-tag keep --no-tag 2>'error: both --current-tag and --no-tag specified' != 0; + $* --open-base 1.2.3 --open-beta 2>'error: both --open-beta and --open-base specified' != 0; + $* --amend 2>'error: --amend requires --revision' != 0; + $* --squash 1 2>'error: --squash requires --amend' != 0; + $* --revision --amend --squash 0 2>'error: invalid --squash value: 0' != 0; $* --revision --amend --no-commit 2>'error: both --amend and --no-commit specified' != 0 } |