# HG changeset patch # User Matt Harbison # Date 1670358731 18000 # Node ID 4836705ab9ba36733f86ab84cff2805cf027a830 # Parent 6a3549a01c02cf3ac7e15ea5dd498352bb06f0a5 tests: conditionalize path output for in-memory pyoxidizer resources diff -r 6a3549a01c02 -r 4836705ab9ba tests/test-debugextensions.t --- a/tests/test-debugextensions.t Tue Dec 06 13:03:36 2022 -0500 +++ b/tests/test-debugextensions.t Tue Dec 06 15:32:11 2022 -0500 @@ -43,16 +43,20 @@ tested with: 3.0 3.1 3.2.1 bug reporting: https://example.org/bts histedit - location: */hgext/histedit.py* (glob) + location: */hgext/histedit.py* (glob) (no-pyoxidizer-in-memory !) + location: */release/app/hg* (glob) (pyoxidizer-in-memory !) bundled: yes mq - location: */hgext/mq.py* (glob) + location: */hgext/mq.py* (glob) (no-pyoxidizer-in-memory !) + location: */release/app/hg* (glob) (pyoxidizer-in-memory !) bundled: yes patchbomb - location: */hgext/patchbomb.py* (glob) + location: */hgext/patchbomb.py* (glob) (no-pyoxidizer-in-memory !) + location: */release/app/hg* (glob) (pyoxidizer-in-memory !) bundled: yes rebase - location: */hgext/rebase.py* (glob) + location: */hgext/rebase.py* (glob) (no-pyoxidizer-in-memory !) + location: */release/app/hg* (glob) (pyoxidizer-in-memory !) bundled: yes $ hg debugextensions -Tjson | sed 's|\\\\|/|g' @@ -75,28 +79,32 @@ "buglink": "", "bundled": true, "name": "histedit", - "source": "*/hgext/histedit.py*", (glob) + "source": "*/hgext/histedit.py*", (glob) (no-pyoxidizer-in-memory !) + "source": */release/app/hg* (glob) (pyoxidizer-in-memory !) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "mq", - "source": "*/hgext/mq.py*", (glob) + "source": "*/hgext/mq.py*", (glob) (no-pyoxidizer-in-memory !) + "source": */release/app/hg* (glob) (pyoxidizer-in-memory !) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "patchbomb", - "source": "*/hgext/patchbomb.py*", (glob) + "source": "*/hgext/patchbomb.py*", (glob) (no-pyoxidizer-in-memory !) + "source": */release/app/hg* (glob) (pyoxidizer-in-memory !) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "rebase", - "source": "*/hgext/rebase.py*", (glob) + "source": "*/hgext/rebase.py*", (glob) (no-pyoxidizer-in-memory !) + "source": */release/app/hg* (glob) (pyoxidizer-in-memory !) "testedwith": [] } ] diff -r 6a3549a01c02 -r 4836705ab9ba tests/test-install.t --- a/tests/test-install.t Tue Dec 06 13:03:36 2022 -0500 +++ b/tests/test-install.t Tue Dec 06 15:32:11 2022 -0500 @@ -13,7 +13,8 @@ checking Mercurial version (*) (glob) checking Mercurial custom build (*) (glob) checking module policy (*) (glob) - checking installed modules (*mercurial)... (glob) + checking installed modules (*mercurial)... (glob) (no-pyoxidizer-in-memory !) + checking installed modules (*/release/app/hg*)... (glob) (pyoxidizer-in-memory !) checking registered compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob) @@ -43,7 +44,8 @@ "encodingerror": null, "extensionserror": null, (no-pure !) "hgmodulepolicy": "*", (glob) - "hgmodules": "*mercurial", (glob) + "hgmodules": "*mercurial", (glob) (no-pyoxidizer-in-memory !) + "hgmodules": "*/release/app/hg*", (glob) (pyoxidizer-in-memory !) "hgver": "*", (glob) "hgverextra": "*", (glob) "problems": 0, @@ -76,7 +78,8 @@ checking Mercurial version (*) (glob) checking Mercurial custom build (*) (glob) checking module policy (*) (glob) - checking installed modules (*mercurial)... (glob) + checking installed modules (*mercurial)... (glob) (no-pyoxidizer-in-memory !) + checking installed modules (*/release/app/hg*)... (glob) (pyoxidizer-in-memory !) checking registered compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob) @@ -125,7 +128,8 @@ checking Mercurial version (*) (glob) checking Mercurial custom build (*) (glob) checking module policy (*) (glob) - checking installed modules (*mercurial)... (glob) + checking installed modules (*mercurial)... (glob) (no-pyoxidizer-in-memory !) + checking installed modules (*/release/app/hg*)... (glob) (pyoxidizer-in-memory !) checking registered compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob) @@ -154,7 +158,8 @@ checking Mercurial version (*) (glob) checking Mercurial custom build (*) (glob) checking module policy (*) (glob) - checking installed modules (*mercurial)... (glob) + checking installed modules (*mercurial)... (glob) (no-pyoxidizer-in-memory !) + checking installed modules (*/release/app/hg*)... (glob) (pyoxidizer-in-memory !) checking registered compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob)