Commits

kiilerix committed 03669c0

ci

  • Participants
  • Parent commits e8edc32

Comments (0)

Files changed (5)

+# HG changeset patch
+# Parent f76ed7aebaef3b76f1b05734dfde4dc1a40d207a
+tests: ^ must be quoted when used on solaris sh
+
+See also f5ce9b052747.
+
+diff --git a/contrib/check-code.py b/contrib/check-code.py
+--- a/contrib/check-code.py
++++ b/contrib/check-code.py
+@@ -72,6 +72,7 @@
+     (r'^alias\b.*=', "don't use alias, use a function"),
+     (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"),
+     (r'^( *)\t', "don't use tabs to indent"),
++    (r'(^| )[^"\']*\^[^"\']*($| )', "^ must be quoted"),
+   ],
+   # warnings
+   [
+@@ -105,9 +106,9 @@
+ for i in [0, 1]:
+     for p, m in testpats[i]:
+         if p.startswith(r'^'):
+-            p = uprefixa + p[1:]
++            p = r"^  [$>] (%s)" % p[1:]
+         else:
+-            p = uprefixa + ".*" + p
++            p = r"^  [$>] .*(%s)" % p
+         utestpats[i].append((p, m))
+ 
+ utestfilters = [
+diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
+--- a/tests/test-commit-amend.t
++++ b/tests/test-commit-amend.t
+@@ -273,7 +273,7 @@
+   $ hg mv c d
+   $ hg ci --amend -m 'b -> d'
+   saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg
+-  $ hg st --rev .^ --copies d
++  $ hg st --rev '.^' --copies d
+   A d
+     b
+   $ hg cp d e
+@@ -281,7 +281,7 @@
+   $ hg cp e f
+   $ hg ci --amend -m 'f = d'
+   saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg
+-  $ hg st --rev .^ --copies f
++  $ hg st --rev '.^' --copies f
+   A f
+     d
+ 
+# HG changeset patch
+# Parent e1f931f514bc81975bfa3711c22f4aeb90856902
+tests: hide diff -u saying 'No differences encountered' on solaris
+
+diff --git a/tests/test-glog.t b/tests/test-glog.t
+--- a/tests/test-glog.t
++++ b/tests/test-glog.t
+@@ -1428,7 +1428,7 @@
+   >     | sed 's/.*nodetag/nodetag/' > log.nodes
+   >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
+   >     | sed 's/.*nodetag/nodetag/' > glog.nodes
+-  >   diff -u log.nodes glog.nodes
++  >   diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :
+   > }
+ 
+ glog always reorders nodes which explains the difference with log
+@@ -1448,7 +1448,6 @@
+   +nodetag 27
+   +nodetag 25
+   +nodetag 21
+-  [1]
+   $ testlog -u test -u not-a-user
+   []
+   (group
+@@ -1975,7 +1974,6 @@
+    nodetag 8
+    nodetag 7
+   +nodetag 6
+-  [1]
+ 
+ Test --follow-first and forward --rev
+ 
+@@ -1992,7 +1990,6 @@
+    nodetag 8
+    nodetag 7
+   +nodetag 6
+-  [1]
+ 
+ Test --follow and backward --rev
+ 

no-test-pull-pull-corruption2

+# HG changeset patch
+# Parent a8a14e9a3a192322e733a1ba898eaffbd337fb3b
+tests: remove test-pull-pull-corruption2.t
+
+This test gave random failures on slow machines (solaris).
+
+The test was added in 6f6e210b38cf as a test case from issue148. It did however
+require manual setup:
+  The attached script creates such a corruption (you have to add a "import time;
+  time.spleep(3)" in localrepo.addchangegroup before the changegroup manifest are
+  written for example.
+The test as it is has thus no value as test case.
+
+test-pending.t already tests what test-pull-pull-corruption2.t could test.
+
+diff --git a/tests/test-pull-pull-corruption2.t b/tests/test-pull-pull-corruption2.t
+deleted file mode 100644
+--- a/tests/test-pull-pull-corruption2.t
++++ /dev/null
+@@ -1,44 +0,0 @@
+-Corrupt an hg repo with two pulls.
+-create one repo with a long history
+-
+-  $ hg init source1
+-  $ cd source1
+-  $ touch foo
+-  $ hg add foo
+-  $ for i in 1 2 3 4 5 6 7 8 9 10; do
+-  >     echo $i >> foo
+-  >     hg ci -m $i
+-  > done
+-  $ cd ..
+-
+-create a third repo to pull both other repos into it
+-
+-  $ hg init version2
+-  $ hg -R version2 pull source1 &
+-  $ sleep 1
+-  pulling from source1
+-  requesting all changes
+-  adding changesets
+-  adding manifests
+-  adding file changes
+-  added 10 changesets with 10 changes to 1 files
+-  (run 'hg update' to get a working copy)
+-  $ hg clone --pull -U version2 corrupted
+-  requesting all changes
+-  adding changesets
+-  adding manifests
+-  adding file changes
+-  added 10 changesets with 10 changes to 1 files
+-  $ wait
+-  $ hg -R corrupted verify
+-  checking changesets
+-  checking manifests
+-  crosschecking files in changesets and manifests
+-  checking files
+-  1 files, 10 changesets, 10 total revisions
+-  $ hg -R version2 verify
+-  checking changesets
+-  checking manifests
+-  crosschecking files in changesets and manifests
+-  checking files
+-  1 files, 10 changesets, 10 total revisions
 
 veritytest
 fncachecache
+checkcode-hat
+diff-u
+sh-bang
+no-test-pull-pull-corruption2
 
 lock-validation
 subxxx
+# HG changeset patch
+# Parent 0055b1429f2af2f6825421051558baea0b4671f6
+tests: solaris sh has no 'if ! command'
+
+diff --git a/contrib/check-code.py b/contrib/check-code.py
+--- a/contrib/check-code.py
++++ b/contrib/check-code.py
+@@ -73,6 +73,7 @@
+     (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"),
+     (r'^( *)\t', "don't use tabs to indent"),
+     (r'(^| )[^"\']*\^[^"\']*($| )', "^ must be quoted"),
++    (r'if\s*!', "use 'if !', use else"),
+   ],
+   # warnings
+   [
+diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
+--- a/tests/test-check-code-hg.t
++++ b/tests/test-check-code-hg.t
+@@ -1,6 +1,7 @@
+   $ check_code="$TESTDIR"/../contrib/check-code.py
+   $ cd "$TESTDIR"/..
+-  $ if ! hg identify -q > /dev/null; then
++  $ if hg identify -q > /dev/null; then :
++  > else
+   >     echo "skipped: not a Mercurial working dir" >&2
+   >     exit 80
+   > fi