This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8425

wait-on-file: don't quote arithmetic argument
ClosedPublic

Authored by marmoute on Apr 15 2020, 3:07 PM.

Details

Reviewers
mharbison72
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2789f25fc2b6: wait-on-file: don't quote arithmetic argument
Summary

This is unnecessary and Mac OS X choke on them.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Apr 15 2020, 3:07 PM
mharbison72 accepted this revision.Apr 15 2020, 6:10 PM
mharbison72 added a subscriber: mharbison72.

I couldn't reproduce the problem on 10.14 with or without this. But I can confirm that it appears to fix the issue on MSYS.

--- g:/Users/test/projects/hg-default-x86_64/Win7_x86_64_hg_tests/build/tests/test-persistent-nodemap.t
+++ g:/Users/test/projects/hg-default-x86_64/Win7_x86_64_hg_tests/build/tests/test-persistent-nodemap.t.err
@@ -354,22 +388,19 @@
   $ wait-on-file 20 sync-txn-pending && \
   > hg debugnodemap --metadata && \
   > wait-on-file 20 sync-txn-close sync-repo-read
+  \Users\test\projects\hg-default-x86_64\Win7_x86_64_hg_tests\build\tests/testlib/wait-on-file: line 16: ("20" * "600") / 180 : syntax error: operand expected (error token is ""20" * "600") / 180 ")
pulkit accepted this revision.Apr 16 2020, 4:10 AM
This revision is now accepted and ready to land.Apr 16 2020, 4:10 AM
marmoute added a commit: rHG2789f25fc2b6: wait-on-file: don't quote arithmetic argument.Apr 16 2020, 12:54 PM
Closed by commit rHG2789f25fc2b6: wait-on-file: don't quote arithmetic argument (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/testlib/wait-on-file (2 lines)

Diff 21102

tests/testlib/wait-on-file

#!/bin/bash #!/bin/bash
# #
# wait up to TIMEOUT seconds until a WAIT_ON_FILE is created. # wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.
# #
# In addition, this script can create CREATE_FILE once it is ready to wait. # In addition, this script can create CREATE_FILE once it is ready to wait.
if [ $# -lt 2 ] || [ $# -gt 3 ]; then if [ $# -lt 2 ] || [ $# -gt 3 ]; then
echo $# echo $#
echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]" echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]"
fi fi
timer="$1" timer="$1"
# if the test timeout have been extended, explicitly extend the provided timer # if the test timeout have been extended, explicitly extend the provided timer
if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then
timer=$(( ("$timer" * "$HGTEST_TIMEOUT") / $HGTEST_TIMEOUT_DEFAULT )) timer=$(( ($timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))
fi fi
wait_on="$2" wait_on="$2"
create="" create=""
if [ $# -eq 3 ]; then if [ $# -eq 3 ]; then
create="$3" create="$3"
fi fi