[Python-apps-commits] r8242 - in packages/mercurial/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Wednesday, February 29, 2012 @ 08:50:16
  Author: vicho
Revision: 8242

Add patch from_upstream__test_check_code_hg_skip_test_if_not_wd.patch to skip test_check_code_hg instead of having to blacklist it

Added:
  packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/mercurial.test_blacklist
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-02-29 08:50:08 UTC (rev 8241)
+++ packages/mercurial/trunk/debian/changelog	2012-02-29 08:50:16 UTC (rev 8242)
@@ -10,8 +10,11 @@
     produces the same output than in faster architectures
   * Ignore the output of chmod in a test so that the testsuite doesn't
     fail in kfreebsd-*
+  * Add patch
+    from_upstream__test_check_code_hg_skip_test_if_not_wd.patch to skip
+    test_check_code_hg instead of having to blacklist it
 
- -- Javi Merino <vicho at debian.org>  Wed, 29 Feb 2012 08:29:18 +0000
+ -- Javi Merino <vicho at debian.org>  Wed, 29 Feb 2012 08:40:28 +0000
 
 mercurial (2.1-2) experimental; urgency=low
 

Modified: packages/mercurial/trunk/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/trunk/debian/mercurial.test_blacklist	2012-02-29 08:50:08 UTC (rev 8241)
+++ packages/mercurial/trunk/debian/mercurial.test_blacklist	2012-02-29 08:50:16 UTC (rev 8242)
@@ -45,7 +45,3 @@
 
 # I'm missing some locales or something (?)
 test-i18n.t
-
-# test-check-code-hg.t doesn't work if the directory is not a hg clone
-# http://mercurial.selenic.com/bts/issue3248
-test-check-code-hg.t

Added: packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch	2012-02-29 08:50:16 UTC (rev 8242)
@@ -0,0 +1,18 @@
+From: Greg Ward <greg at gerg.ca>
+Origin: upstream, http://selenic.com/repo/hg/rev/be6ac2ecc7f8
+Description: test-check-code-hg: skip test if not in a working dir (issue3248)
+Bug-mercurial: http://mercurial.selenic.com/bts/issue3248
+
+--- a/tests/test-check-code-hg.t
++++ b/tests/test-check-code-hg.t
+@@ -1,6 +1,9 @@
+   $ check_code="$TESTDIR"/../contrib/check-code.py
+   $ cd "$TESTDIR"/..
+-
++  $ if ! hg identify -q > /dev/null; then
++  >     echo "skipped: not a Mercurial working dir" >&2
++  >     exit 80
++  > fi
+   $ "$check_code" `hg manifest` || echo 'FAILURE IS NOT AN OPTION!!!'
+ 
+   $ "$check_code" --warnings --nolineno --per-file=0 `hg manifest`

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-02-29 08:50:08 UTC (rev 8241)
+++ packages/mercurial/trunk/debian/patches/series	2012-02-29 08:50:16 UTC (rev 8242)
@@ -9,3 +9,4 @@
 deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__test_false_positive_kfreebsd.patch
+from_upstream__test_check_code_hg_skip_test_if_not_wd.patch