Skip to content

Commit

Permalink
Merge pull request #2852 from sparklemotion/flavorjones-libxml2-2.10.…
Browse files Browse the repository at this point in the history
…4-backport

dep: update to libxml2 2.10.4 (backport)
  • Loading branch information
flavorjones authored Apr 11, 2023
2 parents 1580121 + 36b0b33 commit 347eacb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ bundle exec rake compile test:memcheck
```


Note that by default the test suite will run a major GC after each test completes. This has shown to be useful for localizing some classes of memory bugs, but does slow the suite down. Some variations of the test suite behavior are available (see `test/helper.rb` for more info):
Note that by you can run the test suite with a variety of GC behaviors. For example, running a major after each test completes has, on occasion, been useful for localizing some classes of memory bugs, but does slow the suite down. Some variations of the test suite behavior are available (see `test/helper.rb` for more info):

``` sh
# see failure messages immediately
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libxml2:
version: "2.10.3"
sha256: "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c"
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum
version: "2.10.4"
sha256: "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum

libxslt:
version: "1.1.37"
Expand Down
12 changes: 4 additions & 8 deletions test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# Some environment variables that are used to configure the test suite:
# - NOKOGIRI_TEST_FAIL_FAST: if set to anything, emit test failure messages immediately upon failure
# - NOKOGIRI_TEST_GC_LEVEL: (roughly in order of stress)
# - "normal" - normal GC functionality
# - "normal" - normal GC functionality (default)
# - "minor" - force a minor GC cycle after each test
# - "major" (default for Rubies without compaction) - force a major GC cycle after each test
# - "compact" (default for Rubies with compaction) - force a major GC after each test and GC compaction after every 20 tests
# - "major" - force a major GC cycle after each test
# - "compact" - force a major GC after each test and GC compaction after every 20 tests
# - "verify" - force a major GC after each test and verify references-after-compaction after every 20 tests
# - "stress" - run tests with GC.stress set to true
# - NOKOGIRI_GC: read more in test/test_memory_leak.rb
Expand Down Expand Up @@ -144,12 +144,8 @@ def initialize_nokogiri_test_gc_level
"compact"
elsif (ENV["NOKOGIRI_TEST_GC_LEVEL"] == "verify") && defined?(GC.verify_compaction_references)
"verify"
elsif RUBY_ENGINE == "truffleruby"
"normal"
elsif defined?(GC.compact)
"compact"
else
"major"
"normal"
end

if ["compact", "verify"].include?(@@gc_level)
Expand Down
8 changes: 4 additions & 4 deletions test/xml/test_node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1141,17 +1141,17 @@ def test_namespace_without_an_href_on_html_node
node = html.at("div").children.first
refute_nil(node)

if Nokogiri.uses_libxml?(">= 2.9.12")
if Nokogiri.uses_libxml?(">= 2.10.4") || Nokogiri.jruby?
assert_empty(node.namespaces.keys)
assert_equal("<o:p>foo</o:p>", node.to_html)
elsif Nokogiri.uses_libxml?(">= 2.9.12")
assert_empty(node.namespaces.keys)
assert_equal("<p>foo</p>", node.to_html)
elsif Nokogiri.uses_libxml?
assert_equal(1, node.namespaces.keys.size)
assert(node.namespaces.key?("xmlns:o"))
assert_nil(node.namespaces["xmlns:o"])
assert_equal("<p>foo</p>", node.to_html)
else # jruby
assert_empty(node.namespaces.keys)
assert_equal("<o:p>foo</o:p>", node.to_html)
end
end

Expand Down

0 comments on commit 347eacb

Please sign in to comment.