[PATCH] test-import: enable for Windows

Adrian Buehlmann adrian at cadifra.com
Tue Jun 5 07:15:22 CDT 2012


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1338898244 -7200
# Node ID 9db3ad9bdb59ddd8c8e56eba59e861272d30060e
# Parent  2e7dda59cb0eebd5bc467e83d0a1c03be4361aff
test-import: enable for Windows

diff --git a/tests/test-import.t b/tests/test-import.t
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" unix-permissions || exit 80
-
   $ hg init a
   $ mkdir a/d1
   $ mkdir a/d1/d2
@@ -54,7 +52,9 @@
   > print 'patching file a'
   > file('a', 'wb').write('line2\n')
   > EOF
+#if execbit
   $ chmod +x dummypatch.py
+#endif
   $ hg clone -r0 a b
   adding changesets
   adding manifests
@@ -632,7 +632,7 @@
   > rename to bar
   > EOF
   applying patch from stdin
-  abort: path contains illegal component: ../outside/foo
+  abort: path contains illegal component: ../outside/foo (glob)
   [255]
   $ cd ..
 
@@ -907,6 +907,7 @@
   > new mode 100755
   > EOF
   applying patch from stdin
+#if execbit
   $ hg sum
   parent: 1:d59915696727 tip
    help management of empty pkg and lib directories in perforce
@@ -931,6 +932,29 @@
   diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash
   old mode 100644
   new mode 100755
+#else
+  $ hg sum
+  parent: 1:28f089cc9ccc tip
+   help management of empty pkg and lib directories in perforce
+  branch: default
+  commit: (clean)
+  update: (current)
+  $ hg diff --git -c tip
+  diff --git a/lib/place-holder b/lib/place-holder
+  new file mode 100644
+  --- /dev/null
+  +++ b/lib/place-holder
+  @@ -0,0 +1,2 @@
+  +perforce does not maintain empty directories.
+  +this file helps.
+  diff --git a/pkg/place-holder b/pkg/place-holder
+  new file mode 100644
+  --- /dev/null
+  +++ b/pkg/place-holder
+  @@ -0,0 +1,2 @@
+  +perforce does not maintain empty directories.
+  +this file helps.
+#endif
   $ cd ..
 
 


More information about the Mercurial-devel mailing list