diff options
| -rw-r--r-- | doc/buildfile | 2 | ||||
| -rwxr-xr-x | doc/cli.sh | 4 | ||||
| -rw-r--r-- | tests/ci.testscript | 6 | ||||
| -rw-r--r-- | tests/publish.testscript | 6 | ||||
| -rw-r--r-- | tests/release.testscript | 54 |
5 files changed, 36 insertions, 36 deletions
diff --git a/doc/buildfile b/doc/buildfile index 6fbdb81..9a6929d 100644 --- a/doc/buildfile +++ b/doc/buildfile @@ -14,7 +14,7 @@ define xhtml: doc xhtml{*}: extension = xhtml ./: {man1 xhtml}{bdep bdep-common-options $cmds} \ - css{common pre-box man} \ + css{common pre-box man} \ file{man-*} ./: file{cli.sh} @@ -14,8 +14,8 @@ while [ $# -gt 0 ]; do --clean) rm -f bdep*.xhtml bdep*.1 rm -f build2-project-manager-manual*.ps \ - build2-project-manager-manual*.pdf \ - build2-project-manager-manual.xhtml + build2-project-manager-manual*.pdf \ + build2-project-manager-manual.xhtml exit 0 ;; *) diff --git a/tests/ci.testscript b/tests/ci.testscript index 9d61fc0..7bd6172 100644 --- a/tests/ci.testscript +++ b/tests/ci.testscript @@ -19,9 +19,9 @@ end # server = ($config.bdep.test.repository == [null] \ ? ($build.version.stage \ - ? 'https://stage.build2.org' \ - : 'https://ci.cppget.org') \ - : "$config.bdep.test.repository") + ? 'https://stage.build2.org' \ + : 'https://ci.cppget.org') \ + : "$config.bdep.test.repository") +if ("$server" == '') exit diff --git a/tests/publish.testscript b/tests/publish.testscript index a527b32..9712cf4 100644 --- a/tests/publish.testscript +++ b/tests/publish.testscript @@ -19,9 +19,9 @@ end # repository = ($config.bdep.test.repository == [null] \ ? ($build.version.stage \ - ? 'https://stage.build2.org' \ - : 'https://cppget.org') \ - : "$config.bdep.test.repository") + ? 'https://stage.build2.org' \ + : 'https://cppget.org') \ + : "$config.bdep.test.repository") +if ("$repository" == '') exit diff --git a/tests/release.testscript b/tests/release.testscript index a06bfab..2ab961b 100644 --- a/tests/release.testscript +++ b/tests/release.testscript @@ -83,7 +83,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' Create EOO - cat prj2/manifest >>~%EOO% + cat prj2/manifest >>~%EOO% %.* name: prj version: 0.2.0-a.0.z @@ -177,7 +177,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $* --open-beta 2>'error: --open-beta specified for final current version 0.1.0' != 0; - $* --alpha --open-beta 2>>~%EOE%; + $* --alpha --open-beta 2>>~%EOE%; %.+ pushing branch master, tag v0.1.0-a.1 EOE @@ -189,7 +189,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' Create EOO - $* --beta --open-beta 2>>~%EOE%; + $* --beta --open-beta 2>>~%EOE%; %.+ pushing branch master, tag v0.1.0-b.1 EOE @@ -244,19 +244,19 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $clone_root_repos; $* --alpha --open-minor 2>'error: --open-minor specified for alpha current version 0.1.0-a.1' != 0; - $* --beta --open-minor 2>'error: --open-minor specified for beta current version 0.1.0-b.1' != 0; + $* --beta --open-minor 2>'error: --open-minor specified for beta current version 0.1.0-b.1' != 0; - $* --open-patch 2>>~%EOE%; + $* --open-patch 2>>~%EOE%; %.+ pushing branch master, tag v0.1.0 EOE - $* 2>>~%EOE%; + $* 2>>~%EOE%; %.+ pushing branch master, tag v0.1.1 EOE - $* --open-minor 2>>~%EOE%; + $* --open-minor 2>>~%EOE%; %.+ pushing branch master, tag v0.1.2 EOE @@ -278,7 +278,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' { $clone_root_repos; - $* --open-major 2>>~%EOE%; + $* --open-major 2>>~%EOE%; %.+ pushing branch master, tag v0.1.0 EOE @@ -296,15 +296,15 @@ log2 = $gp2 log '--pretty=format:"%d %s"' { $clone_root_repos; - $* --open-base 1.0 2>>EOE != 0; + $* --open-base 1.0 2>>EOE != 0; error: invalid base version '1.0': '.' expected after minor version EOE - $* --open-base 1.0.0-a.1 2>>EOE != 0; + $* --open-base 1.0.0-a.1 2>>EOE != 0; error: invalid base version '1.0.0-a.1': pre-release EOE - $* --open-base 1.2.3 2>>~%EOE%; + $* --open-base 1.2.3 2>>~%EOE%; %.+ pushing branch master, tag v0.1.0 EOE @@ -316,11 +316,11 @@ log2 = $gp2 log '--pretty=format:"%d %s"' Create EOO - $* --open-base 1.2.2 2>>EOE != 0; + $* --open-base 1.2.2 2>>EOE != 0; error: base version 1.2.2 is less than or equal to current version 1.2.3 EOE - $* --open-base 1.2.3 2>>EOE != 0 + $* --open-base 1.2.3 2>>EOE != 0 error: base version 1.2.3 is less than or equal to current version 1.2.3 EOE } @@ -450,20 +450,20 @@ log2 = $gp2 log '--pretty=format:"%d %s"' : file-value : { - $clone_root_repos; + $clone_root_repos; echo 'description-file: README' >+ prj/manifest; $gp commit -a -m 'Add description'; - $* 2>>~%EOE% != 0; - %error: unable to read .+README referenced by description-file manifest value in .+manifest: .+% - EOE + $* 2>>~%EOE% != 0; + %error: unable to read .+README referenced by description-file manifest value in .+manifest: .+% + EOE touch prj/README; - $gp add README; + $gp add README; $gp commit -m 'Add README file'; - $* 2>>~%EOE% != 0; + $* 2>>~%EOE% != 0; %error: description-file manifest value in .+manifest references empty file .+README% EOE @@ -476,14 +476,14 @@ log2 = $gp2 log '--pretty=format:"%d %s"' : unknown-value : { - $clone_root_repos; + $clone_root_repos; echo 'some-file: README' >+ prj/manifest; $gp commit -a -m 'Add file'; - $* 2>>~%EOE% != 0 - %error: invalid package manifest: .+manifest:.+:1: unknown name 'some-file' in package manifest% - EOE + $* 2>>~%EOE% != 0 + %error: invalid package manifest: .+manifest:.+:1: unknown name 'some-file' in package manifest% + EOE } } @@ -559,7 +559,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $clone_root_repos; sed -i -e 's/^(version:) .*$/\1 0/' prj/manifest; - $gp add manifest; + $gp add manifest; $* --revision; @@ -586,10 +586,10 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $release --tag --push --yes -d prj; - # Updates the existing local tag. - # + # Updates the existing local tag. + # # Note that starting git 2.20.0 --force is also required (see git - # release notes for details). + # release notes for details). # $pull2 --tags --force; $log2 >>:~%EOO% |