aboutsummaryrefslogtreecommitdiff
path: root/tests/publish.testscript
diff options
context:
space:
mode:
Diffstat (limited to 'tests/publish.testscript')
-rw-r--r--tests/publish.testscript12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/publish.testscript b/tests/publish.testscript
index a79657f..28b153d 100644
--- a/tests/publish.testscript
+++ b/tests/publish.testscript
@@ -220,7 +220,7 @@ g = git -C prj >! 2>!
test.options += --no-progress
test.arguments += --simulate 'success'
- clone_prj = cp --no-cleanup -p -r ../prj ./ &prj/***
+ clone_prj = cp --no-cleanup -pr ../prj ./ &prj/***
+$clone_prj
@@ -245,7 +245,7 @@ g = git -C prj >! 2>!
info: use --force=uncommitted to publish anyway
EOE
- $g commit -a -m 'Version';
+ $g commit -am 'Version';
$* 2>>~%EOE%
%package submission is queued(: \.*prj/1.0.16)?%d
@@ -276,7 +276,7 @@ g = git -C prj >! 2>!
#
sleep 1;
- $g commit -a -m 'Version';
+ $g commit -am 'Version';
$* 2>>~%EOE% != 0;
synchronizing:
@@ -298,10 +298,10 @@ g = git -C prj >! 2>!
test.options += --no-progress
test.arguments += --simulate 'success'
- clone_prj = cp --no-cleanup -p -r ../prj ./ &prj/***;
+ clone_prj = cp --no-cleanup -pr ../prj ./ &prj/***;
$clone_prj;
- rm -r -f prj/.git;
+ rm -rf prj/.git;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.18/' prj/manifest;
@@ -538,7 +538,7 @@ g = git -C prj >! 2>!
# Reproduce the situation when the local build2-control branch exists but
# the remote-tracking one doesn't (see brep/publish.cxx for details).
#
- $g branch -D -r origin/build2-control;
+ $g branch -Dr origin/build2-control;
$* >&2 2>>~%EOE%;
synchronizing: