diff options
| author | wiz <wiz> | 2014-12-28 22:47:59 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-12-28 22:47:59 +0000 |
| commit | 4f4a0a7bc732791df245c22470dd5c8c7c3a2a7f (patch) | |
| tree | 69ef270d04c6c52613d6bcdc1b5b42e4727b92d7 /devel/py-mercurial | |
| parent | c9a901b2af7e1bf56d658bbfb6a5299431e3e1d0 (diff) | |
| download | pkgsrc-4f4a0a7bc732791df245c22470dd5c8c7c3a2a7f.tar.gz | |
Adapt glob so this works with NetBSD's /bin/sh.
http://bz.selenic.com/show_bug.cgi?id=4484
and PR 49502.
Diffstat (limited to 'devel/py-mercurial')
| -rw-r--r-- | devel/py-mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-mercurial/patches/patch-tests_test-run-tests.t | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo index 6c10b842e4f..03301cf3722 100644 --- a/devel/py-mercurial/distinfo +++ b/devel/py-mercurial/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2014/12/28 17:16:54 wiz Exp $ +$NetBSD: distinfo,v 1.13 2014/12/28 22:47:59 wiz Exp $ SHA1 (mercurial-3.2.3.tar.gz) = 7c870aebcfd7720813c53c75b0939cee8a0e1168 RMD160 (mercurial-3.2.3.tar.gz) = 76b09015bfb9c84968264a0e419ef5c1b2cd1972 @@ -8,3 +8,4 @@ SHA1 (patch-tests_test-convert-cvs-detectmerge.t) = cc1a846e6fa090149a1ee5d5a916 SHA1 (patch-tests_test-convert-cvs-synthetic.t) = 6978a6a513f04ef1a24b1026642aa03e2d9869e6 SHA1 (patch-tests_test-convert-cvs.t) = 69f9210d59066a2bfb8f2f6fce7642a7c9009dc1 SHA1 (patch-tests_test-convert-cvsnt-mergepoints.t) = 4bfdeb98ece867ea1bb16c0b1dd0db65fc9412a1 +SHA1 (patch-tests_test-run-tests.t) = dbf53354652831bf67a22b60e9000356269c0ef6 diff --git a/devel/py-mercurial/patches/patch-tests_test-run-tests.t b/devel/py-mercurial/patches/patch-tests_test-run-tests.t new file mode 100644 index 00000000000..8b664f4f5cd --- /dev/null +++ b/devel/py-mercurial/patches/patch-tests_test-run-tests.t @@ -0,0 +1,40 @@ +$NetBSD: patch-tests_test-run-tests.t,v 1.1 2014/12/28 22:47:59 wiz Exp $ + +Adapt glob so this works with NetBSD's /bin/sh. +http://bz.selenic.com/show_bug.cgi?id=4484 + +--- tests/test-run-tests.t.orig 2014-12-18 20:59:22.000000000 +0000 ++++ tests/test-run-tests.t +@@ -181,22 +181,22 @@ Running In Debug Mode + ====================== + + $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug 2>&1 | grep -v pwd +- + echo SALT* 0 0 (glob) +- SALT* 0 0 (glob) ++ + echo *SALT* 0 0 (glob) ++ *SALT* 0 0 (glob) + + echo babar + babar +- + echo SALT* 4 0 (glob) +- SALT* 4 0 (glob) +- .+ echo SALT* 0 0 (glob) +- SALT* 0 0 (glob) ++ + echo *SALT* 4 0 (glob) ++ *SALT* 4 0 (glob) ++ .+ echo *SALT* 0 0 (glob) ++ *SALT* 0 0 (glob) + + echo babar + babar +- + echo SALT* 2 0 (glob) +- SALT* 2 0 (glob) ++ + echo *SALT* 2 0 (glob) ++ *SALT* 2 0 (glob) + + echo xyzzy + xyzzy +- + echo SALT* 4 0 (glob) +- SALT* 4 0 (glob) ++ + echo *SALT* 4 0 (glob) ++ *SALT* 4 0 (glob) + . + # Ran 2 tests, 0 skipped, 0 warned, 0 failed. + |