Fix test failures that occur when nokogiri is using system libxml: https://github.com/rgrove/sanitize/issues/198 Taken from upstream: https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb index 2c23074..0756de0 100644 --- a/test/test_malicious_html.rb +++ b/test/test_malicious_html.rb @@ -135,6 +135,8 @@ # The relevant libxml2 code is here: # describe 'unsafe libxml2 server-side includes in attributes' do + using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system? + tag_configs = [ { tag_name: 'a', @@ -166,6 +168,8 @@ input = %[<#{tag_name} #{attr_name}='example.com'>foo] it 'should escape unsafe characters in attributes' do + skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 + # This uses Nokogumbo's HTML-compliant serializer rather than # libxml2's. @s.fragment(input). @@ -191,6 +195,8 @@ input = %[<#{tag_name} #{attr_name}='example.com'>foo] it 'should not escape characters unnecessarily' do + skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 + # This uses Nokogumbo's HTML-compliant serializer rather than # libxml2's. @s.fragment(input). gnu/build/bootloader.scm'>
path: root/gnu/build/bootloader.scm
AgeCommit message (Expand)Author
2020-11-03system: reconfigure: Use the disk-installer if provided....Fixes: <https://issues.guix.gnu.org/44101>. * gnu/build/bootloader.scm (write-file-on-device): Pass 'no-fail flag instead of 'no-create. Use a latin-1 transcoder. * guix/scripts/system/reconfigure.scm (install-bootloader-program): Add a "disk-installer" argument and use it as a fallback. (install-bootloader): Adapt accordingly. * gnu/tests/reconfigure.scm (run-install-bootloader-test): Ditto. Mathieu Othacehe
2020-10-05bootloader: Fix u-boot installation....This is a follow-up of f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa. The bootloader installation must be done on the final disk-image, hence using "disk-image-installer" instead of "installer" callback. * gnu/bootloader/u-boot.scm: Turn all installer callbacks into disk-image-installer callbacks. * gnu/build/bootloader.scm (write-file-on-device): Open the output file with 'no-truncate and 'no-create options. * gnu/system/image.scm (with-imported-modules*): Add (gnu build bootloader) module. Mathieu Othacehe
2020-05-05build: bootloader: Add install-efi procedure....* gnu/build/bootloader.scm (install-efi): New procedure copied from (gnu build vm). (install-efi-loader): New exported procedure, wrapping install-efi. * gnu/build/vm.scm (initialize-hard-disk): Adapt to use install-efi-loader. Mathieu Othacehe
2019-06-17utils: Add 'invoke/quiet'....* gnu/build/bootloader.scm (G_): Remove. (open-pipe-with-stderr, invoke/quiet): Move to... * guix/build/utils.scm: ... here. Use 'let-values' instead of 'define-values' because Guile 2.0 (the bootstrap Guile) doesn't know about 'define-values'. * po/guix/POTFILES.in: Remove gnu/build/bootloader.scm, and add guix/build/utils.scm. * tests/build-utils.scm: Remove import of (gnu build bootloader). Ludovic Courtès
2019-03-16booloader: Add 'invoke/quiet'....* gnu/build/bootloader.scm (G_): New macro. (open-pipe-with-stderr, invoke/quiet): New procedures. * tests/build-utils.scm ("invoke/quiet, success") ("invoke/quiet, failure") ("invoke/quiet, failure, message on stderr"): New tests. * po/guix/POTFILES.in: Add bootloader.scm. Ludovic Courtès