[Pkg-haskell-commits] darcs: darcs: debian/patches/test-issue1763-use-tmpdir: Use a temporary working dir instead of running test in the tests/ directory. Avoids test failure and resulting FTBFS.

[Iain Lane]

Sun Oct  9 16:20:13 UTC 2011  Iain Lane <laney at debian.org>
  * debian/patches/test-issue1763-use-tmpdir: Use a temporary working dir instead of running test in the tests/ directory. Avoids test failure and resulting FTBFS.
  Ignore-this: 861b5fd024e8d8c701c814e96321f96d

    M ./changelog +8
    M ./patches/series +1
    A ./patches/test-issue1763-use-tmpdir

Sun Oct  9 16:20:13 UTC 2011  Iain Lane <laney at debian.org>
  * debian/patches/test-issue1763-use-tmpdir: Use a temporary working dir instead of running test in the tests/ directory. Avoids test failure and resulting FTBFS.
  Ignore-this: 861b5fd024e8d8c701c814e96321f96d
diff -rN -u old-darcs//changelog new-darcs//changelog
--- old-darcs//changelog	2011-10-09 17:02:10.982834817 +0000
+++ new-darcs//changelog	2011-10-09 17:02:11.066835109 +0000
@@ -1,3 +1,11 @@
+darcs (2.5.2-4) UNRELEASED; urgency=low
+
+  * debian/patches/test-issue1763-use-tmpdir: Use a temporary working dir
+    instead of running test in the tests/ directory. Avoids test failure and
+    resulting FTBFS.
+
+ -- Iain Lane <laney at debian.org>  Sun, 09 Oct 2011 17:16:59 +0100
+
 darcs (2.5.2-3) unstable; urgency=low
 
   [ Erik de Castro Lopo ]
diff -rN -u old-darcs//patches/series new-darcs//patches/series
--- old-darcs//patches/series	2011-10-09 17:02:10.982834817 +0000
+++ new-darcs//patches/series	2011-10-09 17:02:11.026831392 +0000
@@ -3,3 +3,4 @@
 skip-external.sh-test
 relax-regex-compat-version
 tests-use-bash
+test-issue1763-use-tmpdir
diff -rN -u old-darcs//patches/test-issue1763-use-tmpdir new-darcs//patches/test-issue1763-use-tmpdir
--- old-darcs//patches/test-issue1763-use-tmpdir	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs//patches/test-issue1763-use-tmpdir	2011-10-09 17:02:11.026831392 +0000
@@ -0,0 +1,26 @@
+Description: Use a temporary working directory to avoid test failure
+Author: Iain Lane <laney at debian.org>
+
+Index: darcs/tests/issue1763-pull-fails-on-non-ascii-filenames.sh
+===================================================================
+--- darcs.orig/tests/issue1763-pull-fails-on-non-ascii-filenames.sh	2011-03-13 22:40:47.000000000 +0000
++++ darcs/tests/issue1763-pull-fails-on-non-ascii-filenames.sh	2011-10-09 17:15:54.889646911 +0100
+@@ -29,7 +29,9 @@
+ 
+ abort_windows # FIXME! We should figure out what's going on here
+ 
+-rm -rf R S
++DIR=$(mktemp -d)
++trap 'rm -rf "$DIR"' EXIT 
++cd $DIR
+ darcs init --repo R
+ 
+ export LC_ALL=C
+@@ -47,7 +49,6 @@
+ darcs record -a -m "First edit"
+ cd ..
+ 
+-rm -rf S S2 S3
+ darcs get R S
+ darcs get R S2
+ darcs get R S3