Patchwork [5,of,7] test-absorb: stabilize for no-execbit platforms

login
register
mail settings
Submitter Matt Harbison
Date Aug. 18, 2018, 7:17 p.m.
Message ID <c2ac7520fb6bbc009761.1534619824@Envy>
Download mbox | patch
Permalink /patch/33882/
State Accepted
Headers show

Comments

Matt Harbison - Aug. 18, 2018, 7:17 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1534613253 14400
#      Sat Aug 18 13:27:33 2018 -0400
# Node ID c2ac7520fb6bbc0097613391f5354489808d8b5c
# Parent  aee8ed1bbd3280214d55cef2b41a810fd48480e4
test-absorb: stabilize for no-execbit platforms

Patch

diff --git a/tests/test-absorb.t b/tests/test-absorb.t
--- a/tests/test-absorb.t
+++ b/tests/test-absorb.t
@@ -325,10 +325,26 @@  Executable files:
   $ cd ..
   $ hg init repo3
   $ cd repo3
+
+#if execbit
   $ echo > foo.py
   $ chmod +x foo.py
   $ hg add foo.py
   $ hg commit -mfoo
+#else
+  $ hg import -q --bypass - <<EOF
+  > # HG changeset patch
+  > foo
+  > 
+  > diff --git a/foo.py b/foo.py
+  > new file mode 100755
+  > --- /dev/null
+  > +++ b/foo.py
+  > @@ -0,0 +1,1 @@
+  > +
+  > EOF
+  $ hg up -q
+#endif
 
   $ echo bla > foo.py
   $ hg absorb --dry-run --print-changes