Skip to content

Commit f649c1e

Browse files
committed
Revert accidentally committed local development changes.
1 parent 2d7f2d3 commit f649c1e

6 files changed

Lines changed: 55 additions & 64 deletions

File tree

.gitignore

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
pkg
2-
nbproject
3-
website/_site
4-
*.swp
5-
*.swo
6-
7-
/ext/vc/libxml_ruby.sdf
8-
/ext/vc/libxml_ruby_19/Debug
9-
/ext/vc/libxml_ruby_18/Debug
10-
/doc
11-
/tmp
12-
/.idea
13-
/ext/vc/ipch
14-
/ext/vc/libxml_ruby.opensdf
15-
.config
16-
InstalledFiles
17-
ext/libxml/libxml_ruby.bundle
18-
.DS_Store
19-
/ext/vc/*.suo
20-
Gemfile.lock
21-
lib/*/libxml_ruby.so
22-
/ext/vc/libxml_ruby/x64
23-
/ext/vc/libxml_ruby/libxml_ruby.vcxproj.user
1+
pkg
2+
nbproject
3+
website/_site
4+
*.swp
5+
*.swo
6+
7+
/ext/vc/libxml_ruby.sdf
8+
/ext/vc/libxml_ruby_19/Debug
9+
/ext/vc/libxml_ruby_18/Debug
10+
/doc
11+
/tmp
12+
/.idea
13+
/ext/vc/ipch
14+
/ext/vc/libxml_ruby.opensdf
15+
.config
16+
InstalledFiles
17+
ext/libxml/libxml_ruby.bundle
18+
.DS_Store
19+
/ext/vc/*.suo
20+
Gemfile.lock
21+
lib/*/libxml_ruby.so
22+
/ext/vc/libxml_ruby/x64
23+
/ext/vc/libxml_ruby/libxml_ruby.vcxproj.user

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
source "https://www.rubygems.org"
22

33
gemspec
4-
gem "ruby_memcheck", path: "../ruby_memcheck"

LICENSE

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
Copyright (c) 2008-2013 Charlie Savage and contributors
2-
Copyright (c) 2002-2007 Sean Chittenden and contributors
3-
Copyright (c) 2001 Wai-Sun "Squidster" Chia
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy of
6-
this software and associated documentation files (the "Software"), to deal in
7-
the Software without restriction, including without limitation the rights to
8-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
9-
of the Software, and to permit persons to whom the Software is furnished to do
10-
so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1+
Copyright (c) 2008-2013 Charlie Savage and contributors
2+
Copyright (c) 2002-2007 Sean Chittenden and contributors
3+
Copyright (c) 2001 Wai-Sun "Squidster" Chia
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
this software and associated documentation files (the "Software"), to deal in
7+
the Software without restriction, including without limitation the rights to
8+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
9+
of the Software, and to permit persons to whom the Software is furnished to do
10+
so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.

Rakefile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require "rubygems"
44
require "rake/extensiontask"
55
require "rake/testtask"
6-
require "ruby_memcheck"
76
require "rubygems/package_task"
87
require "rdoc/task"
98
require "yaml"
@@ -16,14 +15,6 @@ spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
1615

1716
task :default => [:test]
1817

19-
test_config = lambda do |t|
20-
t.libs << "test"
21-
t.test_files = FileList['test/test*.rb'] - ['test/test_suite.rb']
22-
t.verbose = true
23-
end
24-
25-
RubyMemcheck.config(binary_name: SO_NAME)
26-
2718
# Setup compile tasks
2819
Rake::ExtensionTask.new do |ext|
2920
ext.gem_spec = spec
@@ -81,8 +72,8 @@ RDoc::Task.new("rdoc") do |rdoc|
8172
end
8273

8374
# Test Task
84-
Rake::TestTask.new(&test_config)
85-
86-
namespace :test do
87-
RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
88-
end
75+
Rake::TestTask.new do |t|
76+
t.libs << "test"
77+
t.test_files = FileList['test/test*.rb'] - ['test/test_suite.rb']
78+
t.verbose = true
79+
end

libxml-ruby.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ Gem::Specification.new do |spec|
4747
spec.add_development_dependency('rake-compiler')
4848
spec.add_development_dependency('minitest')
4949
spec.add_development_dependency('rdoc')
50-
spec.add_development_dependency('ruby_memcheck')
5150
spec.license = 'MIT'
5251
end

test/test_xpath.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55

66
class TestXPath < Minitest::Test
77
def setup
8-
GC.stress = true
98
@doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
109
end
1110

1211
def teardown
1312
@doc = nil
14-
GC.stress = false
1513
end
1614

1715
def test_doc_find
@@ -32,11 +30,15 @@ def test_ns
3230
end
3331

3432
def test_ns_gc
33+
_stress = GC.stress
34+
GC.stress = true
35+
3536
doc = LibXML::XML::Document.string('<foo xmlns="http://bar.com" />')
3637
node = doc.root
37-
doc = nil
3838
# This line segfaults on prior versions of libxml-ruby
3939
node.find("namespace::*")
40+
41+
GC.stress = _stress
4042
end
4143

4244
def test_ns_array
@@ -154,11 +156,11 @@ def test_memory
154156
# is free, it iterates over its results which are pointers
155157
# to the document's nodes. A segmentation fault then happens.
156158

157-
10.times do
159+
1000.times do
158160
doc = LibXML::XML::Document.new('1.0')
159161
doc.root = LibXML::XML::Node.new("header")
160162

161-
10.times do
163+
1000.times do
162164
doc.root << LibXML::XML::Node.new("footer")
163165
end
164166

0 commit comments

Comments
 (0)